You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by cu...@apache.org on 2010/09/01 05:21:43 UTC
svn commit: r991424 - in /avro/branches/branch-1.4: ./
lang/java/src/java/org/apache/avro/specific/SpecificData.java
Author: cutting
Date: Wed Sep 1 03:21:42 2010
New Revision: 991424
URL: http://svn.apache.org/viewvc?rev=991424&view=rev
Log:
Merge r991423 from trunk to 1.4 branch. Fixes: AVRO-637.
Modified:
avro/branches/branch-1.4/ (props changed)
avro/branches/branch-1.4/lang/java/src/java/org/apache/avro/specific/SpecificData.java
Propchange: avro/branches/branch-1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 1 03:21:42 2010
@@ -1 +1 @@
-/avro/trunk:990852,990860,990867,990871,990878,991031
+/avro/trunk:990852,990860,990867,990871,990878,991031,991423
Modified: avro/branches/branch-1.4/lang/java/src/java/org/apache/avro/specific/SpecificData.java
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.4/lang/java/src/java/org/apache/avro/specific/SpecificData.java?rev=991424&r1=991423&r2=991424&view=diff
==============================================================================
--- avro/branches/branch-1.4/lang/java/src/java/org/apache/avro/specific/SpecificData.java (original)
+++ avro/branches/branch-1.4/lang/java/src/java/org/apache/avro/specific/SpecificData.java Wed Sep 1 03:21:42 2010
@@ -70,7 +70,7 @@ public class SpecificData extends Generi
classCache.put(name, c);
}
return c == NO_CLASS ? null : c;
- case ARRAY: return Collection.class;
+ case ARRAY: return List.class;
case MAP: return Map.class;
case UNION:
List<Schema> types = schema.getTypes(); // elide unions with null