maps take precedence over collections

digama0 · digama0 · commit 2257a3a4599e · 2016-01-08T20:40:06.000-05:00
diff --git a/JSONObject.java b/JSONObject.java
@@ -1681,17 +1681,17 @@ public static Object wrap(Object object) {
                 return object;
             }
 
+            if (object instanceof Map) {
+                Map<?, ?> map = (Map<?, ?>) object;
+                return new JSONObject(map);
+            }
             if (object instanceof Collection) {
                 Collection<?> coll = (Collection<?>) object;
                 return new JSONArray(coll);
             }
             if (object.getClass().isArray()) {
                 return new JSONArray(object);
             }
-            if (object instanceof Map) {
-                Map<?, ?> map = (Map<?, ?>) object;
-                return new JSONObject(map);
-            }
             Package objectPackage = object.getClass().getPackage();
             String objectPackageName = objectPackage != null ? objectPackage
                     .getName() : "";
