Author: cutting
Date: Wed Feb 5 19:50:39 2014
New Revision: 1564903
URL: http://svn.apache.org/r1564903
Log:
AVRO-1439. Fix to work when -Dhadoop.version=2.
Hadoop2 depends on Commons Codec 1.3, while Hadoop1 depends on 1.4.
Modified:
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/AvroMultipleInputs.java
Modified:
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/AvroMultipleInputs.java
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/AvroMultipleInputs.java?rev=1564903&r1=1564902&r2=1564903&view=diff
==============================================================================
---
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/AvroMultipleInputs.java
(original)
+++
avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/AvroMultipleInputs.java
Wed Feb 5 19:50:39 2014
@@ -212,7 +212,7 @@ public class AvroMultipleInputs {
private static String fromBase64(String base64String) {
Base64 base64decoder = new Base64();
- return new String(base64decoder.decode(base64String));
+ return new String(base64decoder.decode(base64String.getBytes()));
}
}