You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/04/02 15:04:12 UTC
svn commit: r1308334 - in /incubator/jena/Jena2/ARQ/trunk/src/main/java:
org/openjena/riot/out/SinkQuadOutput.java
org/openjena/riot/out/SinkTripleOutput.java riotcmd/CmdLangParse.java
Author: andy
Date: Mon Apr 2 13:04:12 2012
New Revision: 1308334
URL: http://svn.apache.org/viewvc?rev=1308334&view=rev
Log:
Don't close the underlying OutputStream that was passed in.
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkQuadOutput.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkTripleOutput.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/riotcmd/CmdLangParse.java
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkQuadOutput.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkQuadOutput.java?rev=1308334&r1=1308333&r2=1308334&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkQuadOutput.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkQuadOutput.java Mon Apr 2 13:04:12 2012
@@ -99,7 +99,7 @@ public class SinkQuadOutput implements S
@Override
public void close()
- {
- try { out.close() ; } catch (IOException ex) { IO.exception(ex) ; }
+ {
+ // Don't close the underlying OutputStream that was passed in.
}
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkTripleOutput.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkTripleOutput.java?rev=1308334&r1=1308333&r2=1308334&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkTripleOutput.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkTripleOutput.java Mon Apr 2 13:04:12 2012
@@ -85,12 +85,13 @@ public class SinkTripleOutput implements
@Override
public void flush()
{
- try { out.flush() ; } catch (IOException ex) { IO.exception(ex) ; }
+ IO.flush(out) ;
}
@Override
public void close()
- {
- try { out.close() ; } catch (IOException ex) { IO.exception(ex) ; }
+ {
+ // Don't close the underlying OutputStream that was passed in.
}
+
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/riotcmd/CmdLangParse.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/riotcmd/CmdLangParse.java?rev=1308334&r1=1308333&r2=1308334&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/riotcmd/CmdLangParse.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/riotcmd/CmdLangParse.java Mon Apr 2 13:04:12 2012
@@ -21,6 +21,7 @@ package riotcmd;
import java.io.ByteArrayInputStream ;
import java.io.IOException ;
import java.io.InputStream ;
+import java.io.OutputStream ;
import java.util.HashMap ;
import java.util.Map ;
import java.util.Properties ;
@@ -170,7 +171,8 @@ public abstract class CmdLangParse exten
protected long totalMillis = 0 ;
protected long totalTuples = 0 ;
-
+ OutputStream output = System.out ;
+
@Override
protected void exec()
{
@@ -182,7 +184,7 @@ public abstract class CmdLangParse exten
if ( modLangParse.getRDFSVocab() != null )
setup = new InferenceSetupRDFS(modLangParse.getRDFSVocab()) ;
-
+
try {
if ( super.getPositional().isEmpty() )
parseFile("-") ;
@@ -197,6 +199,7 @@ public abstract class CmdLangParse exten
if ( super.getPositional().size() > 1 && modTime.timingEnabled() )
output("Total", totalTuples, totalMillis, langHandlerOverall) ;
}
+// IO.close(output) ;
}
public void parseFile(String filename)
@@ -284,11 +287,12 @@ public abstract class CmdLangParse exten
// Uglyness because quads and triples aren't subtype of some Tuple<Node>
// That would change a lot (Triples came several years before Quads).
+
if ( lang.isTriples() )
{
Sink<Triple> s = SinkNull.create() ;
if ( ! modLangParse.toBitBucket() )
- s = new SinkTripleOutput(System.out, null, labels) ;
+ s = new SinkTripleOutput(output, null, labels) ;
if ( setup != null )
s = InfFactory.infTriples(s, setup) ;
@@ -306,7 +310,7 @@ public abstract class CmdLangParse exten
{
Sink <Quad> s = SinkNull.create() ;
if ( ! modLangParse.toBitBucket() )
- s = new SinkQuadOutput(System.out, null, labels) ;
+ s = new SinkQuadOutput(output, null, labels) ;
if ( setup != null )
s = InfFactory.infQuads(s, setup) ;
@@ -347,11 +351,11 @@ public abstract class CmdLangParse exten
}
finally {
IO.close(in) ;
- sink.close() ;
+ // Not close - we may write again to the underlying ouytptu stream in another call to parse a file.
+ sink.flush() ;
}
long x = modTime.endTimer() ;
long n = sink.getCount() ;
-
if ( modTime.timingEnabled() )
output(filename, n, x, handler) ;