Author: rjung
Date: Wed Nov 26 17:43:10 2014
New Revision: 1641869
URL: http://svn.apache.org/r1641869
Log:
Merged revision 1189386 from tomcat/trunk:
In DeltaSession.setId(String): fix duplicate resetDeltaRequest() call.
It occurred via super.setId(id) calling overridden DeltaSession.setId(id, true).
Backport of r1195604 from TC 6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=1641869&r1=1641868&r2=1641869&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Wed Nov 26 17:43:10 2014
@@ -31,6 +31,10 @@
<body>
<section name="Tomcat OACC 0.1 (rjung)">
<subsection name="Cluster">
+ <fix>
+ Fix unneeded duplicate <code>resetDeltaRequest()</code> call in
+ <code>DeltaSession.setId(String)</code>. (kkolinko)
+ </fix>
<update>
In GenericPrincipal, SerializablePrincipal: Do not sort lists of roles
that have only one element. (kkolinko)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java?rev=1641869&r1=1641868&r2=1641869&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Wed Nov 26 17:43:10 2014
@@ -178,7 +178,7 @@ public class DeltaSession extends Standa
* The new session identifier
*/
public void setId(String id) {
- super.setId(id);
+ super.setId(id, true);
resetDeltaRequest();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
