Author: kfujino
Date: Tue Dec 21 06:56:09 2010
New Revision: 1051392
URL: http://svn.apache.org/viewvc?rev=1051392&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50503.
When web application has a version, Engine level Clustering works correctly.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1051392&r1=1051391&r2=1051392&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Tue Dec
21 06:56:09 2010
@@ -592,8 +592,10 @@ public class SimpleTcpCluster extends Li
Container context = manager.getContainer() ;
if(context != null && context instanceof Context) {
Container host = ((Context)context).getParent();
- if(host != null && host instanceof Host && clusterName!=null
&& !(clusterName.indexOf("#")>=0))
+ if(host != null && host instanceof Host && clusterName!=null
&&
+ !(clusterName.startsWith(host.getName() +"#"))) {
clusterName = host.getName() +"#" + clusterName ;
+ }
}
}
return clusterName;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1051392&r1=1051391&r2=1051392&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Dec 21 06:56:09 2010
@@ -209,6 +209,10 @@
node is the only node in the cluster. Log requesting session data as
INFO rather than WARNING. (markt)
</fix>
+ <fix>
+ <bug>50503</bug>: When web application has a version, Engine level
+ Clustering works correctly. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
