From 4c139c3b62144e9336c9a2411cf0f9f0708f0f0b Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 8 Jul 2010 00:05:38 +0000
Subject: [PATCH] Include session ID in error message logged when trying to set
 an attribute on an invalid session.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@961541 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/session/LocalStrings.properties | 2 +-
 java/org/apache/catalina/session/StandardSession.java    | 4 ++--
 webapps/docs/changelog.xml                               | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/session/LocalStrings.properties b/java/org/apache/catalina/session/LocalStrings.properties
index c79804449..61850371a 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -60,7 +60,7 @@ standardSession.notSerializable=Cannot serialize session attribute {0} for sessi
 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
diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java
index 1de906034..9e1c61e94 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -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
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ebe9ea623..1a02f4176 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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">
-- 
2.11.0