Skip to content

Commit 06f23c3

Browse files
committed
fix bug "get user default language null exception"
1 parent 3704870 commit 06f23c3

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/main/java/com/gitblit/authority/GitblitAuthority.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import java.util.Date;
4949
import java.util.HashMap;
5050
import java.util.List;
51+
import java.util.Locale;
5152
import java.util.Map;
5253
import java.util.ResourceBundle;
5354

@@ -852,7 +853,10 @@ private boolean sendEmail(UserModel user, X509Metadata metadata, File zip) {
852853
try {
853854
if (mail.isReady()) {
854855
Mailing mailing = Mailing.newPlain();
855-
mailing.subject = MessageFormat.format(ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp",user.getPreferences().getLocale()).getString("gb.emailClientCertificateSubject"), metadata.serverHostname);
856+
if( user.getPreferences().getLocale()!=null )
857+
mailing.subject = MessageFormat.format(ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp",user.getPreferences().getLocale()).getString("gb.emailClientCertificateSubject"), metadata.serverHostname);
858+
else
859+
mailing.subject = MessageFormat.format(ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", Locale.ENGLISH).getString("gb.emailClientCertificateSubject") , metadata.serverHostname);
856860
mailing.setRecipients(user.emailAddress);
857861
File fileMailTmp = null;
858862
String body = null;

0 commit comments

Comments
 (0)