Author: bpapez
Date: Fri Jun 15 14:34:20 2007
New Revision: 17584

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17584&repname=
=3Djahia
Log:
issue JAHIA-1032: java.lang.IllegalStateException: getAttribute: Session al=
ready invalidated =

http://www.jahia.net/jira/browse/JAHIA-1032

In Jahia.service, where it is chacked that session =3D=3D null, I have also=
 added the check OR !request.isRequestedSessionIdValid(). In this case a ne=
w session is created.

Furthermore in purgeSession, which is only used by the blog system, I do no=
t remove the attribute for "org.apache.jetspeed.container.session.PortalSes=
sionMonitor", because after that one is removed, the session becomes immedi=
ately invalid.

Modified:
    trunk/core/src/java/org/jahia/bin/Jahia.java
    trunk/core/src/java/org/jahia/params/HttpSessionState.java
    trunk/core/src/java/org/jahia/params/ParamBean.java

Modified: trunk/core/src/java/org/jahia/bin/Jahia.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/bin/Jahia.java&rev=3D17584&repname=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
--- trunk/core/src/java/org/jahia/bin/Jahia.java (original)
+++ trunk/core/src/java/org/jahia/bin/Jahia.java Fri Jun 15 14:34:20 2007
@@ -692,7 +692,7 @@
         copySessionCookieToRootContext(request, response);
 =

         HttpSession session =3D request.getSession(false);
-        if (session =3D=3D null) {
+        if (session =3D=3D null || !request.isRequestedSessionIdValid()) {
             // Session could be false because of new user, or missing JSES=
SIONID
             // id for a non-cookie browser, or a false cookie maybe ?
             logger.debug("Session is null");

Modified: trunk/core/src/java/org/jahia/params/HttpSessionState.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/params/HttpSessionState.java&rev=3D17584&repname=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
--- trunk/core/src/java/org/jahia/params/HttpSessionState.java (original)
+++ trunk/core/src/java/org/jahia/params/HttpSessionState.java Fri Jun 15 1=
4:34:20 2007
@@ -69,7 +69,9 @@
         final Iterator namesToRemoveIter =3D namesToRemove.iterator();
         while (namesToRemoveIter.hasNext()) {
             String curAttrName =3D (String) namesToRemoveIter.next();
-            httpSession.removeAttribute(curAttrName);
+            if (!"org.apache.jetspeed.container.session.PortalSessionMonit=
or".equals(curAttrName)) {            =

+                httpSession.removeAttribute(curAttrName);
+            }    =

         }
     }
 =


Modified: trunk/core/src/java/org/jahia/params/ParamBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/params/ParamBean.java&rev=3D17584&repname=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
--- trunk/core/src/java/org/jahia/params/ParamBean.java (original)
+++ trunk/core/src/java/org/jahia/params/ParamBean.java Fri Jun 15 14:34:20=
 2007
@@ -685,7 +685,9 @@
 =

         for (int i =3D 0; i < attr.length; i++) {
             String curAttributeName =3D attr[i];
-            session.removeAttribute(curAttributeName);
+            if (!"org.apache.jetspeed.container.session.PortalSessionMonit=
or".equals(curAttributeName)) {            =

+                session.removeAttribute(curAttributeName);
+            }
         }
 =

         // keep the last language

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to