[commons-digester] branch master updated: No need to nest in else.

[ggregory]

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-digester.git


The following commit(s) were added to refs/heads/master by this push:
     new 26aaab7  No need to nest in else.
26aaab7 is described below

commit 26aaab7e1ee89a382b8a33d7f248e5327c703e94
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Mar 5 14:15:03 2021 -0500

    No need to nest in else.
---
 .../main/java/org/apache/commons/digester3/ExtendedBaseRules.java | 2 +-
 .../java/org/apache/commons/digester3/xmlrules/CallParamRule.java | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git 
a/core/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java 
b/core/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java
index 4434f1b..d455ff7 100644
--- a/core/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java
+++ b/core/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java
@@ -465,7 +465,7 @@ public class ExtendedBaseRules
                     }
                     return -1;
                 }
-                else if ( i2 == null )
+                if ( i2 == null )
                 {
                     return 1;
                 }
diff --git 
a/core/src/main/java/org/apache/commons/digester3/xmlrules/CallParamRule.java 
b/core/src/main/java/org/apache/commons/digester3/xmlrules/CallParamRule.java
index a8236ba..c03e038 100644
--- 
a/core/src/main/java/org/apache/commons/digester3/xmlrules/CallParamRule.java
+++ 
b/core/src/main/java/org/apache/commons/digester3/xmlrules/CallParamRule.java
@@ -63,15 +63,11 @@ final class CallParamRule
         }
         else
         {
-            if ( fromStack == null )
-            {
-                builder.fromAttribute( attributeName );
-            }
-            else
-            {
+            if ( fromStack != null ) {
                 // specifying both from-stack and attribute name is not allowed
                 throw new RuntimeException( "Attributes from-stack and 
attrname cannot both be present." );
             }
+            builder.fromAttribute( attributeName );
         }
     }