svn commit: r1158761 - in /mahout/trunk/integration/src/main/java/org/apache/mahout/utils: SequenceFileDumper.java vectors/VectorDumper.java

[srowen]

Author: srowen
Date: Wed Aug 17 15:08:36 2011
New Revision: 1158761

URL: http://svn.apache.org/viewvc?rev=1158761&view=rev
Log:
MAHOUT-679 also don't close System.out, and flush, in these classes

Modified:
    
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SequenceFileDumper.java
    
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java

Modified: 
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SequenceFileDumper.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SequenceFileDumper.java?rev=1158761&r1=1158760&r2=1158761&view=diff
==============================================================================
--- 
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SequenceFileDumper.java
 (original)
+++ 
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SequenceFileDumper.java
 Wed Aug 17 15:08:36 2011
@@ -88,9 +88,12 @@ public final class SequenceFileDumper {
         Configuration conf = new Configuration();
 
         Writer writer;
+        boolean shouldClose;
         if (cmdLine.hasOption(outputOpt)) {
+          shouldClose = true;
           writer = Files.newWriter(new 
File(cmdLine.getValue(outputOpt).toString()), Charsets.UTF_8);
         } else {
+          shouldClose = false;
           writer = new OutputStreamWriter(System.out);
         }
         try {
@@ -127,8 +130,13 @@ public final class SequenceFileDumper {
             }
             writer.append("Count: 
").append(String.valueOf(count)).append('\n');
           }
+
+          writer.flush();
+
         } finally {
-          Closeables.closeQuietly(writer);
+          if (shouldClose) {
+            Closeables.closeQuietly(writer);
+          }
         }
       }
 

Modified: 
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java?rev=1158761&r1=1158760&r2=1158761&view=diff
==============================================================================
--- 
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java
 (original)
+++ 
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java
 Wed Aug 17 15:08:36 2011
@@ -135,9 +135,12 @@ public final class VectorDumper {
         boolean namesAsComments = cmdLine.hasOption(namesAsCommentsOpt);
         boolean transposeKeyValue = cmdLine.hasOption(vectorAsKeyOpt);
         Writer writer;
+        boolean shouldClose;
         if (cmdLine.hasOption(outputOpt)) {
+          shouldClose = true;
           writer = Files.newWriter(new 
File(cmdLine.getValue(outputOpt).toString()), Charsets.UTF_8);
         } else {
+          shouldClose = false;
           writer = new OutputStreamWriter(System.out);
         }
         try {
@@ -194,8 +197,13 @@ public final class VectorDumper {
             }
             count++;
           }
+
+          writer.flush();
+
         } finally {
-          Closeables.closeQuietly(writer);
+          if (shouldClose) {
+            Closeables.closeQuietly(writer);
+          }
         }
 
       }