commit | 26aaab7e1ee89a382b8a33d7f248e5327c703e94 | [log] [tgz] |
---|---|---|
author | Gary Gregory <garydgregory@gmail.com> | Fri Mar 05 14:15:03 2021 -0500 |
committer | Gary Gregory <garydgregory@gmail.com> | Fri Mar 05 14:15:03 2021 -0500 |
tree | 7398ac431e3984257f1e5722543090854d548ffc | |
parent | a470027ce1e8ac85e625d94b9fc6ddbfbc2d7a55 [diff] |
No need to nest in else.
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 @@ } 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 @@ } 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 ); } }