2.0.7 release.

Karl Rieb · Karl Rieb · commit da153bc81132 · 2016-08-02T11:46:24.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -10,9 +10,13 @@ intellij/
 .idea/
 *.iml
 gradle.properties
+local.properties
 
 # Output file when rendering ReadMe.md locally.
 /ReadMe.html
 
 # editor temp files
-*~
+*~
+
+# pyc files from generator
+*.pyc
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,7 @@
+2.0.7 (2016-08-02)
+---------------------------------------------
+- Backport of v2.1.1 critical deserialization bug fix.
+
 2.0.6 (2016-06-20)
 ---------------------------------------------
 - Update to latest API specs:
diff --git a/ReadMe.md b/ReadMe.md
@@ -14,7 +14,7 @@ If you're using Maven, then edit your project's "pom.xml" and add this to the `<
 <dependency>
     <groupId>com.dropbox.core</groupId>
     <artifactId>dropbox-core-sdk</artifactId>
-    <version>2.0.6</version>
+    <version>2.0.7</version>
 </dependency>
 ```
 
@@ -23,7 +23,7 @@ If you are using Gradle, then edit your project's "build.gradle" and add this to
 ```groovy
 dependencies {
     // ...
-    compile 'com.dropbox.core:dropbox-core-sdk:2.0.6'
+    compile 'com.dropbox.core:dropbox-core-sdk:2.0.7'
 }
 ```
 
diff --git a/src/main/java/com/dropbox/core/stone/StoneSerializer.java b/src/main/java/com/dropbox/core/stone/StoneSerializer.java
@@ -117,6 +117,7 @@ protected static void expectEndArray(JsonParser p) throws IOException, JsonParse
     protected static void skipValue(JsonParser p) throws IOException, JsonParseException {
         if (p.getCurrentToken().isStructStart()) {
             p.skipChildren();
+            p.nextToken();
         } else if (p.getCurrentToken().isScalarValue()) {
             p.nextToken();
         } else {
diff --git a/src/test/java/com/dropbox/core/v2/files/DataTypeSerializationTest.java b/src/test/java/com/dropbox/core/v2/files/DataTypeSerializationTest.java
@@ -67,6 +67,13 @@ public void testUnknownStructFields() throws Exception {
         Dimensions actual = Dimensions.Serializer.INSTANCE.deserialize(json);
 
         assertEquals(actual, expected);
+
+        // change order of fields to ensure we parse valid fields at end of response
+        json = "{\"height\":768,\"alpha\":0.5,\"foo\":{\"bar\":[1, 2, 3],\"baz\":false},\"width\":1024}";
+        expected = new Dimensions(768, 1024);
+        actual = Dimensions.Serializer.INSTANCE.deserialize(json);
+
+        assertEquals(actual, expected);
     }
 
     @Test
