Author: markt
Date: Thu Jul  8 00:05:38 2010
New Revision: 961541

URL: http://svn.apache.org/viewvc?rev=961541&view=rev
Log:
Include session ID in error message logged when trying to set an attribute on 
an invalid session.

Modified:
    tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=961541&r1=961540&r2=961541&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties Thu 
Jul  8 00:05:38 2010
@@ -60,7 +60,7 @@ standardSession.notSerializable=Cannot s
 standardSession.removeAttribute.ise=removeAttribute: Session already 
invalidated
 standardSession.sessionEvent=Session event listener threw exception
 standardSession.setAttribute.iae=setAttribute: Non-serializable attribute {0}
-standardSession.setAttribute.ise=setAttribute: Session already invalidated
+standardSession.setAttribute.ise=setAttribute: Session [{0}] has already been 
invalidated
 standardSession.setAttribute.namenull=setAttribute: name parameter cannot be 
null
 standardSession.sessionCreated=Created Session id = {0}
 persistentManager.loading=Loading {0} persisted sessions

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=961541&r1=961540&r2=961541&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Thu Jul  
8 00:05:38 2010
@@ -1391,8 +1391,8 @@ public class StandardSession
 
         // Validate our current state
         if (!isValidInternal())
-            throw new IllegalStateException
-                (sm.getString("standardSession.setAttribute.ise"));
+            throw new IllegalStateException(sm.getString(
+                    "standardSession.setAttribute.ise", getIdInternal()));
         if ((manager != null) && manager.getDistributable() &&
           !(value instanceof Serializable))
             throw new IllegalArgumentException

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=961541&r1=961540&r2=961541&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jul  8 00:05:38 2010
@@ -116,6 +116,10 @@
         Improve logging of unhandled exceptions in servlets by including the
         path of the context where the error occurred. (markt)
       </add>
+      <add>
+        Include session ID in error message logged when trying to set an
+        attribute on an invalid session. (markt)
+      </add>
     </changelog>
   </subsection>
   <subsection name="Jasper">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to