[jboss-svn-commits] JBL Code SVN: r26936 - labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util.

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

Author: KrisVerlaenen
Date: 2009-06-12 02:24:23 -0400 (Fri, 12 Jun 2009)
New Revision: 26936

Modified:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/DroolsClasspathContainer.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/DroolsRuntimeManager.java
Log:
JBIDE-4040: java.lang.NullPointerException is occured after restarting JBT if there is Drools project in workspace with runtime that was deleted before restarting.
JBIDE-4400: "Initializing Java Tooling" java.lang.NullPointerException when opening a 3.0.0.GA-R200903141626-H5 project with JDBS 2.0.0.GA
 - no NPE when runtime cannot be found, added error message when building project with unknown runtime


Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/DroolsClasspathContainer.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/DroolsClasspathContainer.java	2009-06-12 05:18:21 UTC (rev 26935)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/DroolsClasspathContainer.java	2009-06-12 06:24:23 UTC (rev 26936)
@@ -51,18 +51,20 @@
     		.getPluginPreferences().getInt(IDroolsConstants.INTERNAL_API);
         String[] jarNames = getJarNames(project);
         List<IClasspathEntry> list = new ArrayList<IClasspathEntry>();
-        for (int i = 0; i < jarNames.length; i++) {
-        	Path path = new Path(jarNames[i]);
-        	if (internalAPI != 0) {
-		        if (jarNames[i].contains("drools-api")) {
-		        	list.add(JavaCore.newLibraryEntry(path, path, null));
-		        } else {
-		        	IAccessRule[] accessRules = new IAccessRule[1];
-		            accessRules[0] = new ClasspathAccessRule(new Path("**"), internalAPI);
-		            list.add(JavaCore.newLibraryEntry(
-		                path, path, null, accessRules, ClasspathEntry.NO_EXTRA_ATTRIBUTES, false));
-		        }
-        	}
+        if (jarNames != null) {
+	        for (int i = 0; i < jarNames.length; i++) {
+	        	Path path = new Path(jarNames[i]);
+	        	if (internalAPI != 0) {
+			        if (jarNames[i].contains("drools-api")) {
+			        	list.add(JavaCore.newLibraryEntry(path, path, null));
+			        } else {
+			        	IAccessRule[] accessRules = new IAccessRule[1];
+			            accessRules[0] = new ClasspathAccessRule(new Path("**"), internalAPI);
+			            list.add(JavaCore.newLibraryEntry(
+			                path, path, null, accessRules, ClasspathEntry.NO_EXTRA_ATTRIBUTES, false));
+			        }
+	        	}
+	        }
         }
         return (IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]);
     }

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/DroolsRuntimeManager.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/DroolsRuntimeManager.java	2009-06-12 05:18:21 UTC (rev 26935)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/util/DroolsRuntimeManager.java	2009-06-12 06:24:23 UTC (rev 26936)
@@ -184,10 +184,13 @@
         } else {
         	runtime = getDroolsRuntime(runtimeName);
         }
+        if (runtime == null) {
+        	return null;
+        }
         if (runtime.getJars() == null || runtime.getJars().length == 0) {
     		recognizeJars(runtime);
     	}
-        return runtime == null ? null : runtime.getJars();
+        return runtime.getJars();
     }
     
     public static void recognizeJars(DroolsRuntime runtime) {