commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject svn commit: r1602784 - /commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java
Date Mon, 16 Jun 2014 00:57:57 GMT
Author: dbrosius
Date: Mon Jun 16 00:57:57 2014
New Revision: 1602784

URL: http://svn.apache.org/r1602784
Log:
guard against npes

Modified:
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java?rev=1602784&r1=1602783&r2=1602784&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java Mon
Jun 16 00:57:57 2014
@@ -98,7 +98,7 @@ public abstract class Action implements 
      */
     public final EnterableState getParentEnterableState()
     throws ModelException {
-        if (parent == null && this instanceof Script && ((Script)this).isGlobalScript())
{
+        if (parent == null || (this instanceof Script && ((Script)this).isGlobalScript()))
{
             // global script doesn't have a EnterableState
             return null;
         }



Mime
View raw message