Remove double null check thanks to find bugs...

schallee@darkmist.net · schallee@darkmist.net · commit d2b6dfc70a0a · 2010-02-04T05:42:49.000Z
diff --git a/src/main/java/org/owasp/esapi/util/NullSafe.java b/src/main/java/org/owasp/esapi/util/NullSafe.java
@@ -19,9 +19,7 @@ public static boolean equals(Object a, Object b)
 	{
 		if(a==b)	// short cut same object
 			return true;
-		if(a == null)
-			return (b == null);
-		if(b == null)
+		if(a == null || b == null)
 			return false;
 		return a.equals(b);
 	}

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,7 @@ public static boolean equals(Object a, Object b)`
`19`	`19`	`{`
`20`	`20`	`if(a==b) // short cut same object`
`21`	`21`	`return true;`
`22`		`- if(a == null)`
`23`		`- return (b == null);`
`24`		`- if(b == null)`
	`22`	`+ if(a == null \|\| b == null)`
`25`	`23`	`return false;`
`26`	`24`	`return a.equals(b);`
`27`	`25`	`}`