Merge pull request #341 from mikedev9000/null-pointer-exception-fix

[DROOLS-511] Added null check for the pkg before trying to get the rule.
apache · Sep 23, 2014 · 913b258 · 913b258
2 parents 0a349f7 + 80b3615
commit 913b258
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieContainerImpl.java b/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieContainerImpl.java
@@ -266,11 +266,14 @@ private int updateResourcesIncrementally(InternalKieModule currentKM,
 
             KieBase kBase = kBaseEntry.getValue();
             for ( ResourceChangeSet.RuleLoadOrder loadOrder : rcs.getLoadOrder() ) {
-                RuleImpl rule = ((KnowledgePackageImpl)kBase.getKiePackage( loadOrder.getPkgName() )).getRule( loadOrder.getRuleName() );
-                if ( rule != null ) {
-                    // rule can be null, if it didn't exist before
-                    rule.setLoadOrder( loadOrder.getLoadOrder() );
-                }
+            	KnowledgePackageImpl pkg = (KnowledgePackageImpl)kBase.getKiePackage( loadOrder.getPkgName() );
+            	if( pkg != null ) {
+	                RuleImpl rule = pkg.getRule( loadOrder.getRuleName() );
+	                if ( rule != null ) {
+	                    // rule can be null, if it didn't exist before
+	                    rule.setLoadOrder( loadOrder.getLoadOrder() );
+	                }
+            	}
             }
         }
         return fileCount;