Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50503.

When web application has a version, Engine level Clustering works correctly.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1051392 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
index 74f09fc..ae1b8c5 100644 (file)
--- a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
+++ b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
@@ -592,8 +592,10 @@ public class SimpleTcpCluster extends LifecycleBase
             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;

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b19926a..d38bc1d 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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">