Don't attempt to serialize Iterables and don't special case serializa…

…tion for Path objects, fixes broken Android release. (#495)
getsentry · Aug 22, 2017 · f9f04c2 · f9f04c2
1 parent 2d4743f
commit f9f04c2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,7 +1,7 @@
 Version 1.5.1
 -------------
 
--
+- Don't attempt to serialize Iterables and don't special case serialization for Path objects, fixes broken Android release.
 
 Version 1.5.0
 -------------

diff --git a/sentry/src/main/java/io/sentry/marshaller/json/SentryJsonGenerator.java b/sentry/src/main/java/io/sentry/marshaller/json/SentryJsonGenerator.java
@@ -9,7 +9,7 @@
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.nio.file.Path;
+import java.util.Collection;
 import java.util.Map;
 
 /**
@@ -72,24 +72,6 @@ private void writeObject(Object value, int recursionLevel) throws IOException {
             generator.writeStartArray();
             writeArray(value, recursionLevel);
             generator.writeEndArray();
-        } else if (value instanceof Path) {
-            // Path is weird because it implements Iterable, and then the iterator returns
-            // more Paths, which are iterable... which would cause a stack overflow below.
-            generator.writeString(Util.trimString(value.toString(), maxLengthString));
-        } else if (value instanceof Iterable) {
-            generator.writeStartArray();
-            int i = 0;
-            for (Object subValue : (Iterable<?>) value) {
-                if (i >= maxLengthList) {
-                    writeElided();
-                    break;
-                }
-
-                writeObject(subValue, recursionLevel + 1);
-
-                i++;
-            }
-            generator.writeEndArray();
         } else if (value instanceof Map) {
             generator.writeStartObject();
             int i = 0;
@@ -108,6 +90,20 @@ private void writeObject(Object value, int recursionLevel) throws IOException {
                 i++;
             }
             generator.writeEndObject();
+        } else if (value instanceof Collection) {
+            generator.writeStartArray();
+            int i = 0;
+            for (Object subValue : (Collection<?>) value) {
+                if (i >= maxLengthList) {
+                    writeElided();
+                    break;
+                }
+
+                writeObject(subValue, recursionLevel + 1);
+
+                i++;
+            }
+            generator.writeEndArray();
         } else if (value instanceof String) {
             generator.writeString(Util.trimString((String) value, maxLengthString));
         } else {