Merged V2.2 to HEAD

8121: Merged V2.1 to V2.2
      8088: Turned off debug logging.
      8090: Tweaked session cache limiting for AVM.
      8095: Fix for issue raised in ACT 402
      8108: Fix for AWC-1816
      8115: Build fix 
      8117: Fix AR-1217: OpenOffice connection is actively maintained

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8480 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/LoginBean.java

@@ -27,6 +27,7 @@ package org.alfresco.web.bean;
 import java.io.IOException;
 import java.io.Serializable;
 import java.text.MessageFormat;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.faces.application.FacesMessage;
@@ -374,6 +375,7 @@ public class LoginBean implements Serializable
       
       // need to capture this value before invalidating the session
       boolean externalAuth = isAlfrescoAuth();
+      Locale language = Application.getLanguage(context);
       
       // Invalidate Session for this user.
       if (Application.inPortalServer() == false)
@@ -407,12 +409,8 @@ public class LoginBean implements Serializable
       Map session = context.getExternalContext().getSessionMap();
       session.put(AuthenticationHelper.SESSION_INVALIDATED, true);
       
-      // set language to last used
-      String language = preferences.getLanguage();
-      if (language != null && language.length() != 0)
-      {
-         Application.setLanguage(context, language);
-      }
+      // set language to last used on the login page
+      Application.setLanguage(context, language.toString());
       
       return externalAuth ? "logout" : "relogin";
    }