Fixed (ICE-5768) - JavaScript HashMap improvement

1 files changed, 4 insertions, 30 deletions

diff --git a/js/src/Ice/Struct.js b/js/src/Ice/Struct.js
index f1cb4081370..6d82b81b83a 100644
--- a/js/src/Ice/Struct.js
+++ b/js/src/Ice/Struct.js
@@ -12,40 +12,15 @@ Ice.__M.require(module,
     [
         "../Ice/HashUtil",
         "../Ice/ArrayUtil",
-        "../Ice/HashMap",
         "../Ice/StreamHelpers"
     ]);
 
 var ArrayUtil = Ice.ArrayUtil;
 
-var eq = function(e1, e2)
-{
-    if(e1 === e2)
-    {
-        return true; // If identity compare equals members are equal.
-    }
-    else if(e1 === null || e1 === undefined || e2 === null || e2 === undefined)
-    {
-        return false;
-    }
-    else if(e1.prototype !== e2.prototype)
-    {
-        return false;
-    }
-    else if(e1 instanceof Ice.HashMap)
-    {
-        return e1.equals(e2);
-    }
-    else if(typeof e1.equals == "function")
-    {
-        return e1.equals(e2);
-    }
-    else if(e1 instanceof Array)
-    {
-        return ArrayUtil.equals(e1, e2, eq);
-    }
-    return false;
-};
+//
+// Use generic equality test from ArrayUtil.
+// 
+var eq = ArrayUtil.eq;
 
 var equals = function(other)
 {
@@ -67,7 +42,6 @@ var equals = function(other)
     var e1, e2;
     for(var key in this)
     {
-
         e1 = this[key];
         e2 = other[key];
         if(typeof e1 == "function")