[jboss-svn-commits] JBL Code SVN: r32940 - labs/jbossrules/trunk/drools-ide-common/src/main/java/org/drools/ide/common/client/modeldriven/brl.

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

Author: eaa
Date: 2010-05-18 13:59:40 -0400 (Tue, 18 May 2010)
New Revision: 32940

Modified:
   labs/jbossrules/trunk/drools-ide-common/src/main/java/org/drools/ide/common/client/modeldriven/brl/RuleModel.java
Log:
GUVNOR-545:NullPointerException when trying to add an action and an and/or constraint is used in the LHS
	- Fixed bug: Added Null check for compositeFieldConstraint.constraints in RuleModel

Modified: labs/jbossrules/trunk/drools-ide-common/src/main/java/org/drools/ide/common/client/modeldriven/brl/RuleModel.java
===================================================================
--- labs/jbossrules/trunk/drools-ide-common/src/main/java/org/drools/ide/common/client/modeldriven/brl/RuleModel.java	2010-05-18 17:07:13 UTC (rev 32939)
+++ labs/jbossrules/trunk/drools-ide-common/src/main/java/org/drools/ide/common/client/modeldriven/brl/RuleModel.java	2010-05-18 17:59:40 UTC (rev 32940)
@@ -70,9 +70,12 @@
         }
         if (f instanceof CompositeFieldConstraint) {
             CompositeFieldConstraint s = (CompositeFieldConstraint) f;
-            for (FieldConstraint ss : s.constraints) {
-                return giveFieldBinding(ss,
-                        var);
+            //If the user didn't add any constraint yet, s.constraints is null
+            if (s.constraints != null){
+                for (FieldConstraint ss : s.constraints) {
+                    return giveFieldBinding(ss,
+                            var);
+                }
             }
         }
         return null;
@@ -140,9 +143,13 @@
         }
         if (f instanceof CompositeFieldConstraint) {
             CompositeFieldConstraint s = (CompositeFieldConstraint) f;
-            for (FieldConstraint ss : s.constraints) {
-                List<String> t = giveFieldBinding(ss);
-                result.addAll(t);
+
+            //If the user didn't add any constraint yet, s.constraints is null
+            if (s.constraints != null){
+                for (FieldConstraint ss : s.constraints) {
+                    List<String> t = giveFieldBinding(ss);
+                    result.addAll(t);
+                }
             }
         }
         return result;