avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r1170009 - in /avro/trunk/lang/java: pom.xml protobuf/src/main/java/org/apache/avro/protobuf/ProtobufDatumReader.java
Date Tue, 13 Sep 2011 02:33:04 GMT
Author: cutting
Date: Tue Sep 13 02:33:04 2011
New Revision: 1170009

URL: http://svn.apache.org/viewvc?rev=1170009&view=rev
Log:
AVRO-805. Fix to work with protobuf 2.2 as installed on build server, but revert default protobuf
version to something that's probably compatible with the version of protoc that developers
have on their desktop.

Modified:
    avro/trunk/lang/java/pom.xml
    avro/trunk/lang/java/protobuf/src/main/java/org/apache/avro/protobuf/ProtobufDatumReader.java

Modified: avro/trunk/lang/java/pom.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/pom.xml?rev=1170009&r1=1170008&r2=1170009&view=diff
==============================================================================
--- avro/trunk/lang/java/pom.xml (original)
+++ avro/trunk/lang/java/pom.xml Tue Sep 13 02:33:04 2011
@@ -46,7 +46,7 @@
     <netty-version>3.2.4.Final</netty-version> 
     <jopt-simple-version>3.2</jopt-simple-version>
     <snappy-version>1.0.3.2</snappy-version>
-    <protobuf-version>2.3.0</protobuf-version>
+    <protobuf-version>2.4.1</protobuf-version>
   </properties>
 
   <build>

Modified: avro/trunk/lang/java/protobuf/src/main/java/org/apache/avro/protobuf/ProtobufDatumReader.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/protobuf/src/main/java/org/apache/avro/protobuf/ProtobufDatumReader.java?rev=1170009&r1=1170008&r2=1170009&view=diff
==============================================================================
--- avro/trunk/lang/java/protobuf/src/main/java/org/apache/avro/protobuf/ProtobufDatumReader.java
(original)
+++ avro/trunk/lang/java/protobuf/src/main/java/org/apache/avro/protobuf/ProtobufDatumReader.java
Tue Sep 13 02:33:04 2011
@@ -75,7 +75,7 @@ public class ProtobufDatumReader<T> exte
 
   @Override
   protected Object readBytes(Object old, Decoder in) throws IOException {
-    return ByteString.copyFrom((ByteBuffer)super.readBytes(old, in));
+    return ByteString.copyFrom(((ByteBuffer)super.readBytes(old, in)).array());
   }    
 
   @Override



Mime
View raw message