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/08/10 23:56:45 UTC

svn commit: r984225 - in /avro/trunk: CHANGES.txt lang/java/src/java/org/apache/avro/tool/JsonToBinaryFragmentTool.java lang/java/src/test/java/org/apache/avro/tool/TestJsonToFromBinaryFragmentTools.java

Author: cutting
Date: Tue Aug 10 21:56:44 2010
New Revision: 984225

URL: http://svn.apache.org/viewvc?rev=984225&view=rev
Log:
AVRO-609. Java: Fix JsonToBinaryFragmentTool to flush output.

Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/lang/java/src/java/org/apache/avro/tool/JsonToBinaryFragmentTool.java
    avro/trunk/lang/java/src/test/java/org/apache/avro/tool/TestJsonToFromBinaryFragmentTools.java

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=984225&r1=984224&r2=984225&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Tue Aug 10 21:56:44 2010
@@ -127,6 +127,8 @@ Avro 1.4.0 (unreleased)
 
     AVRO-602. C++: Update documentation to match API.  (Jingguo Yao via cutting)
 
+    AVRO-609. Java: Fix JsonToBinaryFragmentTool to flush output. (cutting)
+
 Avro 1.3.3 (7 June 2010)
 
   IMPROVEMENTS

Modified: avro/trunk/lang/java/src/java/org/apache/avro/tool/JsonToBinaryFragmentTool.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/src/java/org/apache/avro/tool/JsonToBinaryFragmentTool.java?rev=984225&r1=984224&r2=984225&view=diff
==============================================================================
--- avro/trunk/lang/java/src/java/org/apache/avro/tool/JsonToBinaryFragmentTool.java (original)
+++ avro/trunk/lang/java/src/java/org/apache/avro/tool/JsonToBinaryFragmentTool.java Tue Aug 10 21:56:44 2010
@@ -57,6 +57,7 @@ public class JsonToBinaryFragmentTool im
     GenericDatumWriter<Object> writer = 
         new GenericDatumWriter<Object>(schema);
     writer.write(datum, new BinaryEncoder(out));
+    out.flush();
     } finally {
       if (needsClosing) {
         input.close();

Modified: avro/trunk/lang/java/src/test/java/org/apache/avro/tool/TestJsonToFromBinaryFragmentTools.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/src/test/java/org/apache/avro/tool/TestJsonToFromBinaryFragmentTools.java?rev=984225&r1=984224&r2=984225&view=diff
==============================================================================
--- avro/trunk/lang/java/src/test/java/org/apache/avro/tool/TestJsonToFromBinaryFragmentTools.java (original)
+++ avro/trunk/lang/java/src/test/java/org/apache/avro/tool/TestJsonToFromBinaryFragmentTools.java Tue Aug 10 21:56:44 2010
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEqu
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.BufferedOutputStream;
 import java.io.PrintStream;
 import java.util.Arrays;
 
@@ -42,7 +43,7 @@ public class TestJsonToFromBinaryFragmen
   @Test
   public void testBinaryToJson() throws Exception {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    PrintStream p = new PrintStream(baos);
+    PrintStream p = new PrintStream(new BufferedOutputStream(baos));
     
     new BinaryFragmentToJsonTool().run(
         new ByteArrayInputStream(AVRO.getBytes(UTF8)), // stdin
@@ -55,7 +56,7 @@ public class TestJsonToFromBinaryFragmen
   @Test
   public void testJsonToBinary() throws Exception {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    PrintStream p = new PrintStream(baos);
+    PrintStream p = new PrintStream(new BufferedOutputStream(baos));
     new JsonToBinaryFragmentTool().run(
         new ByteArrayInputStream(JSON.getBytes(UTF8)), // stdin
         p, // stdout