Author: bpapez Date: Thu Jun 14 17:16:19 2007 New Revision: 17563 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17563&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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/Jahia.java branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/HttpSession= State.java branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ParamBean.j= ava Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/Jahia.ja= va URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/bin/Jahia.java&rev=3D17563&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/Jahia.java (or= iginal) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/Jahia.java Thu= Jun 14 17:16:19 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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/HttpS= essionState.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/params/HttpSessionState.java&rev=3D17563&re= pname=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/HttpSession= State.java (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/HttpSession= State.java Thu Jun 14 17:16:19 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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/Param= Bean.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/params/ParamBean.java&rev=3D17563&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ParamBean.j= ava (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ParamBean.j= ava Thu Jun 14 17:16:19 2007 @@ -1021,7 +1021,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
