svn commit: r1097917 - in /avro/branches/branch-1.5: ./ CHANGES.txt lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java lang/java/avro/src/test/java/org/apache/avro/io/TestResolvingIOResolving.java

[cutting]

Author: cutting
Date: Fri Apr 29 19:07:04 2011
New Revision: 1097917

URL: http://svn.apache.org/viewvc?rev=1097917&view=rev
Log:
Merge -c 1097916 from trunk to 1.5 branch.  Fixes: AVRO-793.

Modified:
    avro/branches/branch-1.5/   (props changed)
    avro/branches/branch-1.5/CHANGES.txt
    
avro/branches/branch-1.5/lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java
    
avro/branches/branch-1.5/lang/java/avro/src/test/java/org/apache/avro/io/TestResolvingIOResolving.java

Propchange: avro/branches/branch-1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 29 19:07:04 2011
@@ -1 +1 @@
-/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798
+/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798,1097916

Modified: avro/branches/branch-1.5/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/avro/branches/branch-1.5/CHANGES.txt?rev=1097917&r1=1097916&r2=1097917&view=diff
==============================================================================
--- avro/branches/branch-1.5/CHANGES.txt (original)
+++ avro/branches/branch-1.5/CHANGES.txt Fri Apr 29 19:07:04 2011
@@ -65,6 +65,9 @@ Avro 1.5.1 (unreleased)
     AVRO-801. Java: Fix a bug in SaslSocketTransceiver where large
     messages were truncated on write. (cutting)
 
+    AVRO-793. Java: Fix a bug in the resolver when skipping an array
+    within a record. (thiru via cutting)
+
 Avro 1.5.0 (10 March 2011)
 
   INCOMPATIBLE CHANGES

Modified: 
avro/branches/branch-1.5/lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java
URL: 
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java?rev=1097917&r1=1097916&r2=1097917&view=diff
==============================================================================
--- 
avro/branches/branch-1.5/lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java
 (original)
+++ 
avro/branches/branch-1.5/lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java
 Fri Apr 29 19:07:04 2011
@@ -440,6 +440,7 @@ public abstract class Symbol {
   public static class SkipAction extends ImplicitAction {
     public final Symbol symToSkip;
     public SkipAction(Symbol symToSkip) {
+      super(true);
       this.symToSkip = symToSkip;
     }
     

Modified: 
avro/branches/branch-1.5/lang/java/avro/src/test/java/org/apache/avro/io/TestResolvingIOResolving.java
URL: 
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/avro/src/test/java/org/apache/avro/io/TestResolvingIOResolving.java?rev=1097917&r1=1097916&r2=1097917&view=diff
==============================================================================
--- 
avro/branches/branch-1.5/lang/java/avro/src/test/java/org/apache/avro/io/TestResolvingIOResolving.java
 (original)
+++ 
avro/branches/branch-1.5/lang/java/avro/src/test/java/org/apache/avro/io/TestResolvingIOResolving.java
 Fri Apr 29 19:07:04 2011
@@ -188,6 +188,18 @@ public class TestResolvingIOResolving {
           + "{\"name\":\"f1\", \"type\":\"long\"},"
           + "{\"name\":\"f3\", \"type\":\"double\"}]}", "BLD",
           new Object[] { true, 100L, 10.75d } },
+        // Array of record with arrays.
+        { "{ \"type\": \"array\", \"items\":" +
+                       "{\"type\":\"record\",\"name\":\"r\",\"fields\":["
+            + "{\"name\":\"f0\", \"type\":\"boolean\"},"
+            + "{\"name\":\"f1\", \"type\": {\"type\":\"array\", \"items\": 
\"boolean\" }}"
+            + "]}}", "[c2sB[c2sBsB]sB[c3sBsBsB]]",
+            new Object[] { true, false, false, false, true, true, true },
+            "{ \"type\": \"array\", \"items\":" +
+            "{\"type\":\"record\",\"name\":\"r\",\"fields\":["
+            + "{\"name\":\"f0\", \"type\":\"boolean\"}"
+            + "]}}", "[c2sBsB]",
+            new Object[] { true, false } },
     };
   }
 }