svn commit: r355730 - /geronimo/branches/1.0/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java

[am...@apache.org]

Author: ammulder
Date: Sat Dec 10 01:31:22 2005
New Revision: 355730

URL: http://svn.apache.org/viewcvs?rev=355730&view=rev
Log:
Merge hot deploy fix from HEAD

Modified:
    geronimo/branches/1.0/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java

Modified: geronimo/branches/1.0/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java?rev=355730&r1=355729&r2=355730&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java (original)
+++ geronimo/branches/1.0/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java Sat Dec 10 01:31:22 2005
@@ -63,6 +63,7 @@
     private transient Kernel kernel;
     private transient DeploymentFactory factory;
     private transient TargetModuleID[] startupModules = null;
+    private transient boolean serverRunning = false;
 
     public DirectoryHotDeployer(String path, int pollIntervalMillis, ServerInfo serverInfo, Kernel kernel) {
         this.path = path;
@@ -171,6 +172,10 @@
     }
 
     public boolean isServerRunning() {
+        if (serverRunning) {
+            return true;
+        }
+
         // a bit of a hack, but the PersistentConfigurationList is the only thing that knows whether the server is full started!
         GBeanQuery query = new GBeanQuery(null, PersistentConfigurationList.class.getName());
         Set configLists = kernel.listGBeans(query);
@@ -185,6 +190,7 @@
                 log.warn("Hot deployer unable to determine whether kernel is started", e);
             }
         }
+        serverRunning = true;
         return true;
     }