tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r790307 - in /tomcat: container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt
Date Wed, 01 Jul 2009 18:56:14 GMT
Author: rjung
Date: Wed Jul  1 18:56:14 2009
New Revision: 790307

URL: http://svn.apache.org/viewvc?rev=790307&view=rev
Log:
Fix BZ 47389: DeltaManager doesn't do session replication if
notifySessionListenersOnReplication=false.
Backport of r786124 from trunk resp. r789821 from OACC.

Modified:
    tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml
    tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=790307&r1=790306&r2=790307&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
(original)
+++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Wed Jul  1 18:56:14 2009
@@ -1664,10 +1664,12 @@
         session.setMaxInactiveInterval(getMaxInactiveInterval());
         session.setExpireTolerance(this.expireTolerance);
         session.access();
-        if(notifySessionListenersOnReplication)
+        if(notifySessionListenersOnReplication) {
             session.setId(msg.getSessionID());
-        else
+        } else {
             session.setIdInternal(msg.getSessionID());
+            add(session);
+        }
         session.resetDeltaRequest();
         session.endAccess();
 

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=790307&r1=790306&r2=790307&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul  1 18:56:14 2009
@@ -217,6 +217,10 @@
   <subsection name="Cluster">
    <changelog>
      <fix>
+       <bug>47389</bug>: DeltaManager doesn't do session replication if
+       notifySessionListenersOnReplication=false. (fhanik, rjung)
+     </fix>
+     <fix>
        Separate statistics counter lock in FastAsyncSocketSender from inherited
        DataSender lock to reduce blocking during failed node detection. (rjung)
      </fix>
@@ -226,7 +230,7 @@
      </fix>
      <fix>
        <bug>43641</bug>: Use of bind attribute for membership element breaks
-       multicast. (rjung)  
+       multicast. (rjung)
      </fix>
    </changelog>
   </subsection>

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=790307&r1=790306&r2=790307&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul  1 18:56:14 2009
@@ -60,13 +60,6 @@
   -1: markt - For the common and combined pattern in ALV there is no space between %t and
%r
               For the common and combined pattern in ALV the %r has no opening quote, only
the closing quote
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47389
-  DeltaManager doesn't do session replication if notifySessionListenersOnReplication=false.
-  Backport of http://svn.apache.org/viewvc?view=rev&revision=786124 from tc6
-  resp. http://svn.apache.org/viewvc?view=rev&revision=789821 from OACC.
-  +1: rjung, kkolinko, markt
-  -1:
-
 * Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=46990
   Improve locking in cluster membership.
   Backport of http://svn.apache.org/viewvc?view=rev&revision=771009 from tc6



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


Mime
View raw message