From b3705908c7c422be091106f5f0ecb0f1c06d0a56 Mon Sep 17 00:00:00 2001 From: kfujino Date: Tue, 21 Dec 2010 06:56:09 +0000 Subject: [PATCH] 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 --- java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java | 4 +++- webapps/docs/changelog.xml | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java index 74f09fc28..ae1b8c563 100644 --- 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 b19926acd..d38bc1df6 100644 --- 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) + + 50503: When web application has a version, Engine level + Clustering works correctly. (kfujino) + -- 2.11.0