commit 06f23c3c476d02c5e7899ed5ada798bcafa7b4ff
author william <william.fromtw@gmail.com> Wed Jan 25 17:29:05 2017 +0800
committer william <william.fromtw@gmail.com> Wed Jan 25 17:29:05 2017 +0800
tree c713ed937d132109fd2caefcd7ffb8666f3f4157
parent 370487036c1d4037b9c54258eb0e8dbd4ab4036b

fix bug "get user default language null exception"

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

diff --git a/src/main/java/com/gitblit/authority/GitblitAuthority.java b/src/main/java/com/gitblit/authority/GitblitAuthority.java
index 904042c..15c23a7 100644
--- a/src/main/java/com/gitblit/authority/GitblitAuthority.java
+++ b/src/main/java/com/gitblit/authority/GitblitAuthority.java
@@ -48,6 +48,7 @@
 import java.util.Date;

 import java.util.HashMap;

 import java.util.List;

+import java.util.Locale;

 import java.util.Map;

 import java.util.ResourceBundle;

 

@@ -852,7 +853,10 @@
 		try {

 			if (mail.isReady()) {

 				Mailing mailing = Mailing.newPlain();

-				mailing.subject = MessageFormat.format(ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp",user.getPreferences().getLocale()).getString("gb.emailClientCertificateSubject"), metadata.serverHostname);

+                if( user.getPreferences().getLocale()!=null )

+                    mailing.subject = MessageFormat.format(ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp",user.getPreferences().getLocale()).getString("gb.emailClientCertificateSubject"), metadata.serverHostname);

+                else

+                    mailing.subject = MessageFormat.format(ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", Locale.ENGLISH).getString("gb.emailClientCertificateSubject") , metadata.serverHostname);

 				mailing.setRecipients(user.emailAddress);

 				File fileMailTmp = null;

 				String body = null;