Make sure that setIdInternal doesn't try to modify the hashmap

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@454760 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java b/java/org/apache/catalina/ha/session/DeltaSession.java
index 27c60a9..8ade48d 100644 (file)
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -197,7 +197,6 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
                 this.setValid(true);
                 this.setPrimarySession(false);
                 this.access();
-                if (cm.isNotifyListenersOnReplication()) this.setId(getIdInternal());
                 this.resetDeltaRequest();
                 this.endAccess();
             }
@@ -229,7 +228,7 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
      *            The new session identifier
      */
     public void setIdInternal(String id) {
-        super.setId(id);
+        this.id = id;
         resetDeltaRequest();
     }
 
@@ -240,7 +239,8 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
      *            The new session identifier
      */
     public void setId(String id) {
-        setIdInternal(id);
+        super.setId(id);
+        resetDeltaRequest();
     }