Author: rjung Date: Wed Jul 1 19:06:41 2009 New Revision: 790313 URL: http://svn.apache.org/viewvc?rev=790313&view=rev Log: Fix BZ 47389: DeltaManager doesn't do session replication if notifySessionListenersOnReplication=false. Backport of r786124 from trunk.
Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=790313&r1=790312&r2=790313&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jul 1 19:06:41 2009 @@ -111,11 +111,6 @@ +1: fhanik, markt, mturk, rjung -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47389 - http://svn.apache.org/viewvc?rev=786124&view=rev - +1: fhanik, markt, mturk, rjung - -1: - * Update release process to include new windows package zip files with .dll and .exe matching a target CPU. Patch also syncs and fixes nsi installer script. Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=790313&r1=790312&r2=790313&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Wed Jul 1 19:06:41 2009 @@ -1433,10 +1433,12 @@ // use container maxInactiveInterval so that session will expire correctly in case of primary transfer session.setMaxInactiveInterval(getMaxInactiveInterval()); session.access(); - if(notifySessionListenersOnReplication) + if(notifySessionListenersOnReplication) { session.setId(msg.getSessionID()); - else + } else { session.setIdInternal(msg.getSessionID()); + add(session); + } session.resetDeltaRequest(); session.endAccess(); Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=790313&r1=790312&r2=790313&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jul 1 19:06:41 2009 @@ -153,6 +153,15 @@ </update> </changelog> </subsection> + <subsection name="Cluster"> + <changelog> + <fix> + <bug>47389</bug>: DeltaManager doesn't do session replication if + notifySessionListenersOnReplication=false. + Patch by Keiichi Fujino. (fhanik) + </fix> + </changelog> + </subsection> <subsection name="Webapps"> <changelog> <fix> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org