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 2015/08/20 14:06:20 UTC

[5/6] jena git commit: Merge from master

Merge from master


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a8d40b17
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a8d40b17
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a8d40b17

Branch: refs/heads/JENA-491-construct-quads
Commit: a8d40b1749480612a209360fe217f304cd856ec8
Parents: 444a6c9 03ae45e
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 20 13:05:35 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 20 13:05:35 2015 +0100

----------------------------------------------------------------------
 jena-arq/src/main/java/org/apache/jena/query/Query.java       | 7 ++-----
 jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java   | 6 +++++-
 .../src/main/java/org/apache/jena/tdb/store/GraphTDB.java     | 4 +++-
 3 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/a8d40b17/jena-arq/src/main/java/org/apache/jena/query/Query.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/jena/blob/a8d40b17/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
----------------------------------------------------------------------
diff --cc jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
index 05892bb,1159058..4b7faa1
--- a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
@@@ -283,7 -283,9 +283,9 @@@ public class RiotReade
                  @Override
                  public void run()
                  {
+                     out.start();
                      parse(input, lang, baseIRI, out);
 -                    out.finish() ;
++                    // Unsafe: out.finish() ;
                  }
              });
              t.start();
@@@ -317,7 -319,9 +319,9 @@@
                  @Override
                  public void run()
                  {
+                     out.start();
                      parse(input, lang, baseIRI, out);
 -                    //out.finish() ;
++                    // Unsafe: out.finish() ;
                  }
              });
              t.start();