[RHBA-488] fix CCE when enforcing immediate constraints jitting

kiegroup · Mar 6, 2018 · 23d22ad · 23d22ad
1 parent 28c6ae2
commit 23d22ad
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/drools-core/src/main/java/org/drools/core/rule/constraint/MvelConstraint.java b/drools-core/src/main/java/org/drools/core/rule/constraint/MvelConstraint.java
@@ -458,15 +458,24 @@ private String getPropertyNameFromSimpleExpression(String simpleExpression) {
 
     private BitMask calculateMask(Class modifiedClass, Condition condition, List<String> settableProperties) {
         BitMask mask = getEmptyPropertyReactiveMask(settableProperties.size());
-        for (Condition c : ((CombinedCondition)condition).getConditions()) {
-            String propertyName = getFirstInvokedPropertyName(((SingleCondition) c).getLeft());
-            if (propertyName != null) {
-                mask = setPropertyOnMask(modifiedClass, mask, settableProperties, propertyName);
+        if (condition instanceof SingleCondition) {
+            mask = setPropertyOnReactiveMask( modifiedClass, settableProperties, mask, ( SingleCondition ) condition );
+        } else {
+            for (Condition c : (( CombinedCondition ) condition).getConditions()) {
+                mask = setPropertyOnReactiveMask( modifiedClass, settableProperties, mask, ( SingleCondition ) c );
             }
         }
         return mask;
     }
 
+    private BitMask setPropertyOnReactiveMask( Class modifiedClass, List<String> settableProperties, BitMask mask, SingleCondition c ) {
+        String propertyName = getFirstInvokedPropertyName( c.getLeft());
+        if (propertyName != null) {
+            mask = setPropertyOnMask(modifiedClass, mask, settableProperties, propertyName);
+        }
+        return mask;
+    }
+
     private String getFirstInvokedPropertyName(Expression expression) {
         if (!(expression instanceof EvaluatedExpression)) {
             return null;