You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by db...@apache.org on 2014/06/16 02:57:57 UTC
svn commit: r1602784 -
/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java
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;
}
Re: svn commit: r1602784 - /commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java
Posted by Ate Douma <at...@douma.nu>.
Dave,
Thanks for detecting and fixing the potential NPE below, much appreciated!
But your fix had a potential functional side-effect, which I now fixed in
http://svn.apache.org/r1621831
Maybe it would be good if you (or whoever) applies such micro fixes to also send
a heads-up to the dev@ list so we'd notice these earlier and are better aware of
the need to review them...
Thanks, Ate
On 16-06-14 02:57, dbrosius@apache.org wrote:
> 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;
> }
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org