svn commit: r915394 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java

[doogie-3]

Author: doogie
Date: Tue Feb 23 15:44:19 2010
New Revision: 915394

URL: http://svn.apache.org/viewvc?rev=915394&view=rev
Log:
Use UtilObject.equalsHelper for null-safe comparison.

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java?rev=915394&r1=915393&r2=915394&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java Tue Feb 23 15:44:19 2010
@@ -25,6 +25,7 @@
 
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilGenerics;
+import org.ofbiz.base.util.UtilObject;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.cache.UtilCache;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
@@ -213,10 +214,7 @@
         }
         try {
             FlexibleMapAccessor that = (FlexibleMapAccessor) obj;
-            if (this.original == null && that.original == null) {
-                return true;
-            }
-            return this.original.equals(that.original);
+            return UtilObject.equalsHelper(this.original, that.original);
         } catch (Exception e) {}
         return false;
     }