svn commit: r1634506 - /ofbiz/branches/json-integration-refactoring/framework/base/src/org/ofbiz/base/lang/JSON.java

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1634506 - /ofbiz/branches/json-integration-refactoring/framework/base/src/org/ofbiz/base/lang/JSON.java

adrianc
Author: adrianc
Date: Mon Oct 27 11:42:28 2014
New Revision: 1634506

URL: http://svn.apache.org/r1634506
Log:
Fix equals method in JSON.java.

Modified:
    ofbiz/branches/json-integration-refactoring/framework/base/src/org/ofbiz/base/lang/JSON.java

Modified: ofbiz/branches/json-integration-refactoring/framework/base/src/org/ofbiz/base/lang/JSON.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/base/src/org/ofbiz/base/lang/JSON.java?rev=1634506&r1=1634505&r2=1634506&view=diff
==============================================================================
--- ofbiz/branches/json-integration-refactoring/framework/base/src/org/ofbiz/base/lang/JSON.java (original)
+++ ofbiz/branches/json-integration-refactoring/framework/base/src/org/ofbiz/base/lang/JSON.java Mon Oct 27 11:42:28 2014
@@ -69,7 +69,13 @@ public final class JSON {
 
     @Override
     public boolean equals(Object obj) {
-        return jsonString.equals(obj);
+        if (obj == this) {
+            return true;
+        }
+        if (obj instanceof JSON) {
+            return jsonString.equals(obj);
+        }
+        return false;
     }
 
     @Override