[jboss-svn-commits] JBL Code SVN: r24725 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent.

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

Author: mark.proctor at jboss.com
Date: 2009-01-14 18:43:57 -0500 (Wed, 14 Jan 2009)
New Revision: 24725

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/DirectoryScanner.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/URLScanner.java
Log:
JBRULES-1890 FileScanner throws NPE in Exception handler when listener is null

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/DirectoryScanner.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/DirectoryScanner.java	2009-01-14 23:38:06 UTC (rev 24724)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/DirectoryScanner.java	2009-01-14 23:43:57 UTC (rev 24725)
@@ -30,6 +30,7 @@
 		
 		scanner = new FileScanner();
 		scanner.setFiles( dir.listFiles() );		
+		scanner.setAgentListener( this.listener );
 	}
 
 	PackageChangeInfo loadPackageChanges() {
@@ -74,7 +75,9 @@
 	
     public void setAgentListener(AgentEventListener listener) {
         super.setAgentListener( listener );
-        this.scanner.setAgentListener( listener );
+        if ( this.scanner != null ) {
+            this.scanner.setAgentListener( listener );
+        }
     }
 	
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/URLScanner.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/URLScanner.java	2009-01-14 23:38:06 UTC (rev 24724)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/URLScanner.java	2009-01-14 23:43:57 UTC (rev 24725)
@@ -56,12 +56,15 @@
             }
             this.localCacheFileScanner = new FileScanner();
             this.localCacheFileScanner.setFiles( getFiles( urls, localCacheDir ) );
+            this.localCacheFileScanner.setAgentListener( this.listener );
         }
     }
     
     public void setAgentListener(AgentEventListener listener) {
         super.setAgentListener( listener );
-        this.localCacheFileScanner.setAgentListener( listener );
+        if ( this.localCacheFileScanner != null ) {
+            this.localCacheFileScanner.setAgentListener( listener );
+        }
     }    
 
     File[] getFiles(URL[] urls, File cacheDir) {