[jboss-cvs] JBossAS SVN: r97582 - branches/JBPAPP_5_0/system/src/main/org/jboss/system/server/profileservice/hotdeploy.

[jboss-cvs-commits at lists.jboss.org]

Author: jiwils
Date: 2009-12-08 22:40:20 -0500 (Tue, 08 Dec 2009)
New Revision: 97582

Modified:
   branches/JBPAPP_5_0/system/src/main/org/jboss/system/server/profileservice/hotdeploy/HDScanner.java
Log:
Fix for JBPAPP-3234.  Setting HDScanner's scanEnabled attribute to true via XML results in an NPE.

Modified: branches/JBPAPP_5_0/system/src/main/org/jboss/system/server/profileservice/hotdeploy/HDScanner.java
===================================================================
--- branches/JBPAPP_5_0/system/src/main/org/jboss/system/server/profileservice/hotdeploy/HDScanner.java	2009-12-09 02:29:41 UTC (rev 97581)
+++ branches/JBPAPP_5_0/system/src/main/org/jboss/system/server/profileservice/hotdeploy/HDScanner.java	2009-12-09 03:40:20 UTC (rev 97582)
@@ -52,7 +52,7 @@
  * @author adrian at jboss.org
  * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
  * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- * 
+ *
  * @version $Revision$
  * @see MainDeployer
  * @see ProfileService
@@ -184,7 +184,7 @@
     */
    public synchronized void setScanEnabled(boolean scanEnabled)
    {
-      if (scanEnabled == true && activeScan == null)
+      if (scanEnabled == true && activeScan == null && scanExecutor != null)
       {
          start();
       }
@@ -369,7 +369,7 @@
          if (modified)
          {
             deployer.process();
-            
+
             // Only check the modified deployments to avoid duplicate errors
             for(String name : modifiedDeploymentNames)
             {