Attachment 602782 Details for Bug 846362 – proposed patch

proposed patch

file_846362.txt (text/plain), 3.21 KB, created by Lukas Krejci on 2012-08-07 14:49:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lukas Krejci

Created: 2012-08-07 14:49:18 UTC

Size: 3.21 KB

patch

obsolete

>diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java
>index 60fa42d..7c389eb 100644
>--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java
>+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java
>@@ -80,8 +80,11 @@ public class ApplicationServerOperationsDelegate {
>     /**
>      * max amount of time to wait for server to show as unavailable after
>      * executing stop - in milliseconds
>+     * 
>+     * NOTE: this is an instance field, so that multiple AS instances in the same plugin container don't influence
>+     * each other's values
>      */
>-    private static long STOP_WAIT_MAX = 1000L * 150; // 2.5 minutes
>+    private long stopWaitMax = 1000L * 150; // 2.5 minutes
> 
>     /**
>      * amount of time to wait between availability checks when performing a stop
>@@ -95,8 +98,13 @@ public class ApplicationServerOperationsDelegate {
>      */
>     private static final long STOP_WAIT_FINAL = 1000L * 30; // 30 seconds
> 
>-    /** max amount of time to wait for start to complete - in milliseconds */
>-    private static long START_WAIT_MAX = 1000L * 300; // 5 minutes
>+    /**
>+     *  max amount of time to wait for start to complete - in milliseconds 
>+     *  
>+     * NOTE: this is an instance field, so that multiple AS instances in the same plugin container don't influence
>+     * each other's values
>+     */
>+    private long startWaitMax = 1000L * 300; // 5 minutes
> 
>     /**
>      * amount of time to wait between availability checks when performing a
>@@ -507,11 +515,11 @@ public class ApplicationServerOperationsDelegate {
>         if ((property != null) && (property.getIntegerValue() != null)) {
>             int newValue = property.getIntegerValue();
>             if (newValue >= 1) {
>-                START_WAIT_MAX = 1000L * 60 * newValue;
>+                startWaitMax = 1000L * 60 * newValue;
>             }
>         }
>         while (((avail = this.serverComponent.getAvailability()) == AvailabilityType.DOWN)
>-            && (System.currentTimeMillis() < (start + START_WAIT_MAX))) {
>+            && (System.currentTimeMillis() < (start + startWaitMax))) {
>             try {
>                 Thread.sleep(START_WAIT_INTERVAL);
>             } catch (InterruptedException e) {
>@@ -532,11 +540,11 @@ public class ApplicationServerOperationsDelegate {
>         if ((property != null) && (property.getIntegerValue() != null)) {
>             int newValue = property.getIntegerValue();
>             if (newValue >= 1) {
>-                STOP_WAIT_MAX = 1000L * 60 * newValue;
>+                stopWaitMax = 1000L * 60 * newValue;
>             }
>         }
>         while (((avail = this.serverComponent.getAvailability()) == AvailabilityType.UP)
>-            && (System.currentTimeMillis() < (start + STOP_WAIT_MAX))) {
>+            && (System.currentTimeMillis() < (start + stopWaitMax))) {
>             try {
>                 Thread.sleep(STOP_WAIT_INTERVAL);
>             } catch (InterruptedException e) {

Actions: View

Attachments on bug 846362: 602782