Return array when calling replaceObject with an array

SkygearIO · Jun 15, 2018 · 2bc0a50 · 2bc0a50
1 parent 4da830b
commit 2bc0a50
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/skygear/src/main/java/io/skygear/skygear/Database.java b/skygear/src/main/java/io/skygear/skygear/Database.java
@@ -129,7 +129,7 @@ private static Object replaceObject(Object object, Map mapTable) {
         } else if (object instanceof List) {
             return Database.replaceObject((List)object, mapTable);
         } else if (object instanceof Object[]) {
-            return Database.replaceObject(Arrays.asList((Object[])object), mapTable);
+            return Database.replaceObject((Object[])object, mapTable);
         } else {
             return object;
         }
@@ -153,6 +153,14 @@ private static List replaceObject(List object, Map mapTable) {
         return newList;
     }
 
+    private static Object[] replaceObject(Object[] object, Map mapTable) {
+        Object[] newArray = new Object[object.length];
+        for (int i = 0; i < newArray.length; i++) {
+            newArray[i] = Database.replaceObject(object[i], mapTable);
+        }
+        return newArray;
+    }
+
     private static Record replaceObject(Record object, Map mapTable) {
         // TODO: It is better to create a clone of the Record object, but
         // the Record class does not offer a clone method.