commit c7640bc4404aeaac162f00e52f7fd1bea4b06348
author Joachim Sauer <jsauer@google.com> Tue May 10 17:44:00 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 10 17:44:00 2016 +0000
tree f7a1cf862552cde3e02d72083790af013ab45a53
parent 7a133242429c2c29bd968d4b1fc5f7f3bb4375e8
parent 62f4ca1f64eaeb0896416949d6120b912ac67d3b

Fix merging add/remove on same method. am: 8f27032b2a am: 98ed536fd8
am: 62f4ca1f64

* commit '62f4ca1f64eaeb0896416949d6120b912ac67d3b':
  Fix merging add/remove on same method.

Change-Id: I440220ee5e7a8a94eb6c56ff3573bb654db95dba

src/jdiff/MergeChanges.java

diff --git a/src/jdiff/MergeChanges.java b/src/jdiff/MergeChanges.java
index d253ff4..7ef0a84 100755
--- a/src/jdiff/MergeChanges.java
+++ b/src/jdiff/MergeChanges.java
@@ -210,9 +210,10 @@
             for (int i = startAdded; i <= endAdded; i++) {
                 MethodAPI addedMethod2 = (MethodAPI)(classDiff.methodsAdded.get(i));
                 if (addedMethod2.inheritedFrom_ == null &&
-                    removedMethod.equalSignatures(addedMethod2))
+                    removedMethod.equalSignatures(addedMethod2)) {
                     addedIdx = i;
                     break;
+                }
             }
             if (addedIdx == -1)
                 return;