BZ-995436 - NPE when entry-point is not set for InsertObjectCommand

apache · Sep 24, 2013 · b71b48d · b71b48d
1 parent 0bd9854
commit b71b48d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/drools-core/src/main/java/org/drools/core/command/runtime/rule/InsertElementsCommand.java b/drools-core/src/main/java/org/drools/core/command/runtime/rule/InsertElementsCommand.java
@@ -55,7 +55,7 @@ public class InsertElementsCommand
     private boolean returnObject = true;
 
     @XmlAttribute(name="entry-point")
-    private String entryPoint;
+    private String entryPoint = "DEFAULT";
 
     public InsertElementsCommand() {
         this.objects = new ArrayList<Object>();
@@ -125,6 +125,9 @@ public String getEntryPoint() {
     }
 
     public void setEntryPoint(String entryPoint) {
+    	if (entryPoint == null) {
+    		entryPoint = "DEFAULT";
+    	}
         this.entryPoint = entryPoint;
     }
 

diff --git a/drools-core/src/main/java/org/drools/core/command/runtime/rule/InsertObjectCommand.java b/drools-core/src/main/java/org/drools/core/command/runtime/rule/InsertObjectCommand.java
@@ -137,6 +137,9 @@ public String getEntryPoint() {
     }
 
     public void setEntryPoint(String entryPoint) {
+    	if (entryPoint == null) {
+    		entryPoint = "DEFAULT";
+    	}
         this.entryPoint = entryPoint;
     }
 

diff --git a/drools-core/src/main/java/org/drools/core/command/runtime/rule/UpdateCommand.java b/drools-core/src/main/java/org/drools/core/command/runtime/rule/UpdateCommand.java
@@ -33,8 +33,8 @@ public class UpdateCommand
     private static final long serialVersionUID = 3255044102543531497L;
 
     private DisconnectedFactHandle handle;
-    private Object     object;
-    private String     entryPoint;
+    private Object object;
+    private String entryPoint = "DEFAULT";
 
     public UpdateCommand() {
     }
@@ -58,6 +58,9 @@ public String getEntryPoint() {
     }
 
     public void setEntryPoint(String entryPoint) {
+    	if (entryPoint == null) {
+    		entryPoint = "DEFAULT";
+    	}
         this.entryPoint = entryPoint;
     }