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

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

Author: michael.neale at jboss.com
Date: 2007-06-25 04:27:33 -0400 (Mon, 25 Jun 2007)
New Revision: 12821

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/HttpClientImpl.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/IHttpClient.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/URLScanner.java
Log:
JBRULES-752 changed class exception handling slightly

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/HttpClientImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/HttpClientImpl.java	2007-06-25 08:22:35 UTC (rev 12820)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/HttpClientImpl.java	2007-06-25 08:27:33 UTC (rev 12821)
@@ -43,7 +43,7 @@
         
     }
 
-    public Package fetchPackage(URL url) throws IOException {
+    public Package fetchPackage(URL url) throws IOException, ClassNotFoundException {
         URLConnection con = url.openConnection();
         HttpURLConnection httpCon = (HttpURLConnection) con;
         try {
@@ -51,12 +51,8 @@
             InputStream in = httpCon.getInputStream();
             
             DroolsObjectInputStream oin = new DroolsObjectInputStream(in);
-            try {
                 return (Package) oin.readObject();
-            } catch ( ClassNotFoundException e ) {            
-                e.printStackTrace();
-                return null;
-            }
+  
         } finally {
             httpCon.disconnect();
         }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/IHttpClient.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/IHttpClient.java	2007-06-25 08:22:35 UTC (rev 12820)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/IHttpClient.java	2007-06-25 08:27:33 UTC (rev 12821)
@@ -17,7 +17,7 @@
 
     public LastUpdatedPing checkLastUpdated(URL url) throws IOException;
     
-    public Package fetchPackage(URL url) throws IOException;
+    public Package fetchPackage(URL url) throws IOException, ClassNotFoundException;
     
     
 }

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	2007-06-25 08:22:35 UTC (rev 12820)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/URLScanner.java	2007-06-25 08:27:33 UTC (rev 12821)
@@ -14,7 +14,6 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.drools.RuleBase;
 import org.drools.RuntimeDroolsException;
 import org.drools.rule.Package;
 
@@ -94,11 +93,14 @@
                 return localCacheFileScanner.loadPackageChanges();                
             }
             listener.exception( e );
-        }
+        } catch ( ClassNotFoundException e ) {
+            this.listener.exception( e );
+            this.listener.warning( "Was unable to load a class when loading a package. Perhaps it is missing from this application." );
+        }        
         return null;
     }
     
-    private Package[] getChangeSet() throws IOException {
+    private Package[] getChangeSet() throws IOException, ClassNotFoundException {
         if ( this.urls == null ) return new Package[0];
         List list = new ArrayList();
         for ( int i = 0; i < urls.length; i++ ) {
@@ -131,7 +133,7 @@
         
     }
 
-    private Package readPackage(URL u) throws IOException {
+    private Package readPackage(URL u) throws IOException, ClassNotFoundException {
         return httpClient.fetchPackage( u );        
     }