[commons-bcel] branch master updated: Merge statements and remove trailing whitespace.

[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-bcel.git


The following commit(s) were added to refs/heads/master by this push:
     new 37d3043  Merge statements and remove trailing whitespace.
37d3043 is described below

commit 37d3043a8eba15499553b537ba81f4c5e1eb60ec
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jul 10 09:34:16 2021 -0400

    Merge statements and remove trailing whitespace.
---
 .../java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java  | 5 +----
 src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java  | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git 
a/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java 
b/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
index 9ce3a15..7cc286f 100644
--- a/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
+++ b/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
@@ -179,10 +179,7 @@ public class ControlFlowGraph{
                 inFrames.put(lastExecutionJSR(), inFrame);
                 inF = inFrame;
             } else {// if there was an "old" inFrame
-                if (inF.equals(inFrame)) { // shortcut: no need to merge equal 
frames.
-                    return false;
-                }
-                if (!mergeInFrames(inFrame)) {
+                if (inF.equals(inFrame) || !mergeInFrames(inFrame)) {
                     return false;
                 }
             }
diff --git 
a/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java 
b/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
index 799147c..a8b5cbb 100644
--- a/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
+++ b/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
@@ -622,7 +622,7 @@ public class Subroutines{
 
         final Instruction inst = instruction.getInstruction();
 
-        
+
 
         // Terminates method normally.
         // Terminates method abnormally, because JustIce mandates