You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/02/06 11:37:54 UTC

svn commit: r1442891 - in /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina: SimpleTomEETcpCluster.java TomcatWebAppBuilder.java

Author: rmannibucau
Date: Wed Feb  6 10:37:54 2013
New Revision: 1442891

URL: http://svn.apache.org/viewvc?rev=1442891&view=rev
Log:
TOMEE-609 manage case where cluster listeners are specified

Modified:
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/SimpleTomEETcpCluster.java
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/SimpleTomEETcpCluster.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/SimpleTomEETcpCluster.java?rev=1442891&r1=1442890&r2=1442891&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/SimpleTomEETcpCluster.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/SimpleTomEETcpCluster.java Wed Feb  6 10:37:54 2013
@@ -59,7 +59,15 @@ public class SimpleTomEETcpCluster exten
         if (currentListeners.size() == 1 && currentListeners.iterator().next() == TomEEClusterListener.INSTANCE) {
             currentListeners.clear();
         }
+
+        // else force the new cluster listener
+        for (ClusterListener clusterListener : currentListeners) {
+            clusterListener.setCluster(this);
+        }
+
         super.checkDefaults();
         addClusterListener(TomEEClusterListener.INSTANCE);
+
+
     }
 }

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1442891&r1=1442890&r2=1442891&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Wed Feb  6 10:37:54 2013
@@ -301,7 +301,7 @@ public class TomcatWebAppBuilder impleme
     }
 
     private void manageCluster(final Cluster cluster) {
-        if (cluster == null) {
+        if (cluster == null || cluster instanceof SimpleTomEETcpCluster) {
             return;
         }