Author: kkolinko
Date: Sun Jun 22 16:37:40 2014
New Revision: 1604607
URL: http://svn.apache.org/r1604607
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=56657
If sessionid belongs to the latest version of webapp, use the latest version.
Merged r1604605 from tomcat/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1604605
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1604607&r1=1604606&r2=1604607&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Sun Jun 22 16:37:40 2014
@@ -764,7 +764,7 @@ public class CoyoteAdapter implements Ad
for (int i = (contexts.length); i > 0; i--) {
Context ctxt = (Context) contexts[i - 1];
if (ctxt.getManager().findSession(sessionID) != null) {
- // Was the correct context already mapped?
+ // We found a context. Is it the one that has
already been mapped?
if
(!ctxt.equals(request.getMappingData().context)) {
// Set version so second time through mapping
the
// correct context is found
@@ -772,8 +772,8 @@ public class CoyoteAdapter implements Ad
// Reset mapping
request.getMappingData().recycle();
mapRequired = true;
- break;
}
+ break;
}
}
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1604607&r1=1604606&r2=1604607&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Jun 22 16:37:40 2014
@@ -106,6 +106,11 @@
<code>Method.isAnnotationPresent()</code>. Based on a patch by Jian
Mou.
(markt/kkolinko)
</scode>
+ <fix>
+ <bug>56657</bug>: When using parallel deployment, if the same session
id
+ matches different versions of a web application, prefer the latest
+ version. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
