Index: java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
===================================================================
--- java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java	(revision 1034174)
+++ java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java	(working copy)
@@ -592,8 +592,10 @@
             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;