[jboss-svn-commits] JBL Code SVN: r35230 - labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/core.

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

Author: KrisVerlaenen
Date: 2010-09-22 08:18:20 -0400 (Wed, 22 Sep 2010)
New Revision: 35230

Modified:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/core/StateBasedNodeWrapper.java
Log:
JBIDE-7076: Flow Editor - "Undo" did not complete normally
 - fixing NPE when (re)setting timers of a state-based node to null

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/core/StateBasedNodeWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/core/StateBasedNodeWrapper.java	2010-09-22 11:25:36 UTC (rev 35229)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/ruleflow/core/StateBasedNodeWrapper.java	2010-09-22 12:18:20 UTC (rev 35230)
@@ -73,8 +73,10 @@
         if (TIMERS.equals(id)) {
         	getStateBasedNode().removeAllTimers();
         	// adding one by one so the ids are set correctly
-        	for (Map.Entry<Timer, DroolsAction> entry: ((Map<Timer, DroolsAction>) value).entrySet()) {
-        		getStateBasedNode().addTimer(entry.getKey(), entry.getValue());
+        	if (value != null) {
+	        	for (Map.Entry<Timer, DroolsAction> entry: ((Map<Timer, DroolsAction>) value).entrySet()) {
+	        		getStateBasedNode().addTimer(entry.getKey(), entry.getValue());
+	        	}
         	}
         } else {
             super.setPropertyValue(id, value);