svn commit: r1609449 - in /jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io: input/readers/ output/writers/

[rvesse]

Author: rvesse
Date: Thu Jul 10 12:08:52 2014
New Revision: 1609449

URL: http://svn.apache.org/r1609449
Log:
Explicitly close PipedRDFIterator from RecordReader when aborting due to an 
error

Modified:
    
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/readers/AbstractBlockBasedNodeTupleReader.java
    
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/readers/AbstractWholeFileNodeTupleReader.java
    
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/AbstractLineBasedNodeTupleWriter.java

Modified: 
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/readers/AbstractBlockBasedNodeTupleReader.java
URL: 
http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/readers/AbstractBlockBasedNodeTupleReader.java?rev=1609449&r1=1609448&r2=1609449&view=diff
==============================================================================
--- 
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/readers/AbstractBlockBasedNodeTupleReader.java
 (original)
+++ 
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/readers/AbstractBlockBasedNodeTupleReader.java
 Thu Jul 10 12:08:52 2014
@@ -289,8 +289,10 @@ public abstract class AbstractBlockBased
         } catch (Throwable e) {
             // Failed to read the tuple on this line
             LOG.error("Error parsing block, aborting further parsing", e);
-            if (!this.ignoreBadTuples)
+            if (!this.ignoreBadTuples) {
+                this.iter.close();
                 throw new IOException("Error parsing block at position " + 
(this.start + this.input.getBytesRead()) + ", aborting further parsing", e);
+            }
             this.key = null;
             this.tuple = null;
             this.finished = true;

Modified: 
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/readers/AbstractWholeFileNodeTupleReader.java
URL: 
http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/readers/AbstractWholeFileNodeTupleReader.java?rev=1609449&r1=1609448&r2=1609449&view=diff
==============================================================================
--- 
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/readers/AbstractWholeFileNodeTupleReader.java
 (original)
+++ 
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/input/readers/AbstractWholeFileNodeTupleReader.java
 Thu Jul 10 12:08:52 2014
@@ -258,6 +258,7 @@ public abstract class AbstractWholeFileN
                     if (!this.ignoreBadTuples)
                         throw new IOException("Error parsing whole file at 
position " + this.input.getBytesRead() + ", aborting further parsing",
                                 this.parserError);
+
                 }
 
                 this.key = null;
@@ -273,8 +274,10 @@ public abstract class AbstractWholeFileN
         } catch (Throwable e) {
             // Failed to read the tuple on this line
             LOG.error("Error parsing whole file, aborting further parsing", e);
-            if (!this.ignoreBadTuples)
+            if (!this.ignoreBadTuples) {
+                this.iter.close();
                 throw new IOException("Error parsing whole file at position " 
+ this.input.getBytesRead() + ", aborting further parsing", e);
+            }
             this.key = null;
             this.tuple = null;
             this.finished = true;

Modified: 
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/AbstractLineBasedNodeTupleWriter.java
URL: 
http://svn.apache.org/viewvc/jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/AbstractLineBasedNodeTupleWriter.java?rev=1609449&r1=1609448&r2=1609449&view=diff
==============================================================================
--- 
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/AbstractLineBasedNodeTupleWriter.java
 (original)
+++ 
jena/Experimental/hadoop-rdf/hadoop-rdf-io/src/main/java/org/apache/jena/hadoop/rdf/io/output/writers/AbstractLineBasedNodeTupleWriter.java
 Thu Jul 10 12:08:52 2014
@@ -59,7 +59,7 @@ public abstract class AbstractLineBasedN
     /**
      * Default terminator written at the end of each line
      */
-    public static final String DEFAULT_TERMINATOR = " .";
+    public static final String DEFAULT_TERMINATOR = ".";
 
     private static final Logger log = 
LoggerFactory.getLogger(AbstractLineBasedNodeTupleWriter.class);