svn commit: r1447569 - /tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java

[kfujino]

Author: kfujino
Date: Tue Feb 19 01:48:17 2013
New Revision: 1447569

URL: http://svn.apache.org/r1447569
Log:
Improve support for Engine level cluster.
Excludes ClusterValve from Engine Valves.

Modified:
    tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java

Modified: 
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java?rev=1447569&r1=1447568&r2=1447569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java Tue 
Feb 19 01:48:17 2013
@@ -18,6 +18,8 @@
 package org.apache.catalina.storeconfig;
 
 import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.catalina.Cluster;
 import org.apache.catalina.Container;
@@ -26,6 +28,7 @@ import org.apache.catalina.LifecycleList
 import org.apache.catalina.Realm;
 import org.apache.catalina.Valve;
 import org.apache.catalina.core.StandardEngine;
+import org.apache.catalina.ha.ClusterValve;
 
 /**
  * Store server.xml Element Engine
@@ -71,7 +74,14 @@ public class StandardEngineSF extends St
 
             // Store nested <Valve> elements
             Valve valves[] = engine.getPipeline().getValves();
-            storeElementArray(aWriter, indent, valves);
+            if(valves != null && valves.length > 0 ) {
+                List<Valve> engineValves = new ArrayList<>() ;
+                for(int i = 0 ; i < valves.length ; i++ ) {
+                    if(!( valves[i] instanceof ClusterValve))
+                        engineValves.add(valves[i]);
+                }
+                storeElementArray(aWriter, indent, engineValves.toArray());
+            }
 
             // store all <Cluster> elements
             Cluster cluster = engine.getCluster();



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org