svn commit: [jahia] r18669 - /branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingContext.java

[bpapez]

Author: bpapez
Date: Wed Sep 26 15:03:59 2007
New Revision: 18669

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18669&repname=
=3Djahia
Log:
fix NPE on import

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/Proce=
ssingContext.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/params/ProcessingContext.java&rev=3D18669&r=
epname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java Wed Sep 26 15:03:59 2007
@@ -1156,11 +1156,13 @@
         }
 =

         // STEP 1 : let's retrieve the current session locale
-        setCurrentLocale((Locale) this.getSessionState().getAttribute(
-                SESSION_LOCALE));
-        if (getCurrentLocale() !=3D null
-                && siteLanguages.contains(getCurrentLocale())) {
-            newLocaleList.add(getCurrentLocale());
+        if (this.getSessionState() !=3D null) {
+            setCurrentLocale((Locale) this.getSessionState().getAttribute(
+                    SESSION_LOCALE));
+            if (getCurrentLocale() !=3D null
+                    && siteLanguages.contains(getCurrentLocale())) {
+                newLocaleList.add(getCurrentLocale());
+            }
         }
 =

         // STEP 3 : retrieve the browser locales

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list