This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-scxml.git

commit a21b575064bd8c999fe934390659e9c9081f3494
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Sep 12 10:44:13 2024 -0400

    Remove redundant syntax
    
    Merge if clauses
---
 src/main/java/org/apache/commons/scxml2/env/SimpleContext.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/commons/scxml2/env/SimpleContext.java 
b/src/main/java/org/apache/commons/scxml2/env/SimpleContext.java
index 78f3780e..e18de1ac 100644
--- a/src/main/java/org/apache/commons/scxml2/env/SimpleContext.java
+++ b/src/main/java/org/apache/commons/scxml2/env/SimpleContext.java
@@ -142,7 +142,7 @@ public class SimpleContext implements Context, Serializable 
{
      */
     @Override
     public boolean has(final String name) {
-        return (hasLocal(name) || (parent != null && parent.has(name)));
+        return hasLocal(name) || parent != null && parent.has(name);
     }
 
     /**
@@ -154,7 +154,7 @@ public class SimpleContext implements Context, Serializable 
{
      */
     @Override
     public boolean hasLocal(final String name) {
-        return (getVars().containsKey(name));
+        return getVars().containsKey(name);
     }
 
     /**
@@ -178,12 +178,10 @@ public class SimpleContext implements Context, 
Serializable {
      */
     @Override
     public void set(final String name, final Object value) {
-        if (getVars().containsKey(name)) { //first try to override local
+        if (getVars().containsKey(name) || parent == null || 
!parent.has(name)) { //first try to override local
             setLocal(name, value);
-        } else if (parent != null && parent.has(name)) { //then check for 
global
+        } else { //then check for global
             parent.set(name, value);
-        } else { //otherwise create a new local variable
-            setLocal(name, value);
         }
     }
 

Reply via email to