Sync git svn branch with SVN repository r33216.

[simantics/platform.git] / bundles / org.simantics.databoard / src / org / simantics / databoard / util / ObjectUtils.java

diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/util/ObjectUtils.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/util/ObjectUtils.java
index 8293f0232b06df41ccec386019c77c50fccf53ef..f360b25ecaa321ae5be8253fe77e1df0eaabbc81 100644 (file)
--- a/bundles/org.simantics.databoard/src/org/simantics/databoard/util/ObjectUtils.java
+++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/util/ObjectUtils.java
@@ -18,6 +18,7 @@ import java.util.Arrays;
 import java.util.Collection;\r
 import java.util.HashSet;\r
 import java.util.Iterator;\r
+import java.util.Objects;\r
 import java.util.Set;\r
 
 /**
@@ -37,7 +38,9 @@ public class ObjectUtils {
     public static boolean objectEquals(Object o1, Object o2) {
         if (o1==o2) return true;
         if (o1==null && o2==null) return true;
-        if (o1==null || o2==null) return false;
+        if (o1==null || o2==null) return false;\r
+        if (o1.getClass().isArray() && o2.getClass().isArray())\r
+            return Objects.deepEquals(o1, o2);
         return o1.equals(o2);
     }