InternalUserSessionData: initialize language in afterPropertiesSet()

#713
metasfresh · Dec 4, 2017 · 1f41c97 · 1f41c97
1 parent bafa907
commit 1f41c97
Showing 1 changed file with 20 additions and 19 deletions.
diff --git a/src/main/java/de/metas/ui/web/session/InternalUserSessionData.java b/src/main/java/de/metas/ui/web/session/InternalUserSessionData.java
@@ -111,44 +111,45 @@ public InternalUserSessionData()
 		ctx = new Properties();
 		Env.setContext(ctx, CTXNAME_IsServerContext, false);
 
+		UserSession.logger.trace("User session created: {}", this);
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception
+	{
+		//
+		// Set initial properties
+		setShowColumnNamesForCaption(defaultShowColumnNamesForCaption);
+		setAllowDeprecatedRestAPI(defaultAllowDeprecatedRestAPI);
+		setHttpCacheMaxAge(defaultHttpCacheMaxAge);
+		setUseHttpAcceptLanguage(defaultUseHttpAcceptLanguage);
+
+		//
 		// Set initial language
 		try
 		{
 			final Language language = findInitialLanguage();
 			verifyLanguageAndSet(language);
 		}
-		catch (final Exception e)
+		catch (final Throwable ex)
 		{
-			UserSession.logger.warn("Failed setting the language, but moving on", e);
+			UserSession.logger.warn("Failed setting the language, but moving on", ex);
 		}
-
-		UserSession.logger.trace("User session created: {}", this);
 	}
-	
+
 	private static final Language findInitialLanguage()
 	{
 		final Locale locale = LocaleContextHolder.getLocale();
-		if(locale != null)
+		if (locale != null)
 		{
 			final Language language = Language.findLanguageByLocale(locale);
-			if(language != null)
+			if (language != null)
 			{
 				return language;
 			}
 		}
-
-		return Language.getBaseLanguage();
-	}
 
-	@Override
-	public void afterPropertiesSet() throws Exception
-	{
-		//
-		// Set initial properties
-		setShowColumnNamesForCaption(defaultShowColumnNamesForCaption);
-		setAllowDeprecatedRestAPI(defaultAllowDeprecatedRestAPI);
-		setHttpCacheMaxAge(defaultHttpCacheMaxAge);
-		setUseHttpAcceptLanguage(defaultUseHttpAcceptLanguage);
+		return Language.getBaseLanguage();
 	}
 
 	@Override