[jboss-svn-commits] JBL Code SVN: r26920 - labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules.

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

Author: Rikkola
Date: 2009-06-11 05:02:46 -0400 (Thu, 11 Jun 2009)
New Revision: 26920

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules/SuggestionCompletionLoader.java
Log:
GUVNOR-353 : Error while loading a model jar in Guvnor

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules/SuggestionCompletionLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules/SuggestionCompletionLoader.java	2009-06-11 06:15:03 UTC (rev 26919)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules/SuggestionCompletionLoader.java	2009-06-11 09:02:46 UTC (rev 26920)
@@ -383,18 +383,31 @@
                             List jars) {
         Class clazz = null;
         try {
-            clazz = resolver.resolveType(className);
-        } catch (ClassNotFoundException e1) {
-            try {
-                addJars(jars);
-                clazz = resolver.resolveType(className);
-            } catch (Exception e) {
-                this.errors.add("Class not found: " + className);
-            }
+            clazz = resolver.resolveType( className );
+        } catch ( ClassFormatError e1 ) {
+            clazz = loadClass( className,
+                               jars,
+                               clazz );
+        } catch ( ClassNotFoundException e1 ) {
+            clazz = loadClass( className,
+                               jars,
+                               clazz );
         }
         return clazz;
     }
 
+    private Class loadClass(String className,
+                            List jars,
+                            Class clazz) {
+        try {
+            addJars( jars );
+            clazz = resolver.resolveType( className );
+        } catch ( Exception e ) {
+            this.errors.add( "Class not found: " + className );
+        }
+        return clazz;
+    }
+
     private void loadClassFields(final Class clazz,
                                  final String shortTypeName) throws IOException {
         if (clazz == null) {