Merge pull request stleary#380 from johnjaylward/FixFalsePositiveSimilar

stleary · web-flow · commit 28e09dc4938e · 2017-11-11T16:12:06.000-06:00
Fix for false positives in similar functions
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+# ignore eclipse project files
+.project
+.classpath
diff --git a/JSONArray.java b/JSONArray.java
@@ -1289,7 +1289,7 @@ public boolean similar(Object other) {
             Object valueThis = this.myArrayList.get(i);
             Object valueOther = ((JSONArray)other).myArrayList.get(i);
             if(valueThis == valueOther) {
-            	return true;
+            	continue;
             }
             if(valueThis == null) {
             	return false;
diff --git a/JSONObject.java b/JSONObject.java
@@ -1844,7 +1844,7 @@ public boolean similar(Object other) {
                 Object valueThis = entry.getValue();
                 Object valueOther = ((JSONObject)other).get(name);
                 if(valueThis == valueOther) {
-                	return true;
+                	continue;
                 }
                 if(valueThis == null) {
                 	return false;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# ignore eclipse project files`
	`2`	`+.project`
	`3`	`+.classpath`
Original file line number	Diff line number	Diff line change
`@@ -1289,7 +1289,7 @@ public boolean similar(Object other) {`
`1289`	`1289`	`Object valueThis = this.myArrayList.get(i);`
`1290`	`1290`	`Object valueOther = ((JSONArray)other).myArrayList.get(i);`
`1291`	`1291`	`if(valueThis == valueOther) {`
`1292`		`- return true;`
	`1292`	`+ continue;`
`1293`	`1293`	`}`
`1294`	`1294`	`if(valueThis == null) {`
`1295`	`1295`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -1844,7 +1844,7 @@ public boolean similar(Object other) {`
`1844`	`1844`	`Object valueThis = entry.getValue();`
`1845`	`1845`	`Object valueOther = ((JSONObject)other).get(name);`
`1846`	`1846`	`if(valueThis == valueOther) {`
`1847`		`- return true;`
	`1847`	`+ continue;`
`1848`	`1848`	`}`
`1849`	`1849`	`if(valueThis == null) {`
`1850`	`1850`	`return false;`