Merge pull request #40 from pferraro/1.2.x

[1.2.x] Revise MODCLUSTER-332 fix.
modcluster · Aug 30, 2013 · 87b0919 · 87b0919
2 parents 13fc306 + 8809746
commit 87b0919
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/container-spi/src/main/java/org/jboss/modcluster/container/Connector.java b/container-spi/src/main/java/org/jboss/modcluster/container/Connector.java
@@ -55,10 +55,11 @@ public int getDefaultPort() {
          * 
          * @see java.lang.Enum#toString()
          */
+        @Override
         public String toString() {
             return this.name().toLowerCase();
         }
-    };
+    }
 
     /**
      * Indicates whether the endpoint of this connector uses a reverse connection to httpd. A reverse connection uses a normal

diff --git a/...na/src/main/java/org/jboss/modcluster/container/catalina/CatalinaEventHandlerAdapter.java b/...na/src/main/java/org/jboss/modcluster/container/catalina/CatalinaEventHandlerAdapter.java
@@ -47,19 +47,17 @@
  */
 public class CatalinaEventHandlerAdapter implements CatalinaEventHandler {
 
+    private static final int STATUS_FREQUENCY = Integer.parseInt(System.getProperty("org.jboss.modcluster.container.catalina.status-frequency", "1"));
+
     protected final ContainerEventHandler eventHandler;
     protected final ServerProvider serverProvider;
     protected final CatalinaFactory factory;
 
     // Flags used to ignore redundant or invalid events
     protected final AtomicBoolean init = new AtomicBoolean(false);
     protected final AtomicBoolean start = new AtomicBoolean(false);
-
-    protected final int WAITSTATUS = Integer.parseInt(System.getProperty("org.jboss.modcluster.container.catalina.WAITSTATUS", "10"));
-    protected int waited = 0;
-    protected int interval = -1;
 
-    // ----------------------------------------------------------- Constructors
+    private volatile int statusCount = 0;
 
     /**
      * Constructs a new CatalinaEventHandlerAdapter using the specified event handler.
@@ -244,19 +242,13 @@ public void lifecycleEvent(LifecycleEvent event) {
             }
         } else if (type.equals(Lifecycle.PERIODIC_EVENT)) {
             if (source instanceof Engine) {
-            	if (interval==-1) {
-            		Engine eng = (Engine) source;
-            		interval = eng.getBackgroundProcessorDelay();
-            		if (interval==0)
-            			interval = 10;
-            	}
-            	waited = waited + interval;
-            	if (waited>=WAITSTATUS || WAITSTATUS<=interval) {
-            		waited = 0;
-            		if (this.start.get()) {
-            			this.eventHandler.status(this.factory.createEngine((Engine) source));
-            		}
-            	}
+                Engine engine = (Engine) source;
+                this.statusCount = (this.statusCount + 1) % STATUS_FREQUENCY;
+                if (this.statusCount == 0) {
+                    if (this.start.get()) {
+                        this.eventHandler.status(this.factory.createEngine(engine));
+                    }
+                }
             }
         }
     }