Repository: jena Updated Branches: refs/heads/master 4e7459cc4 -> c83c87744
Setup parser with lang and source. Don't suppress internal error. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c83c8774 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c83c8774 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c83c8774 Branch: refs/heads/master Commit: c83c8774450cb9e53e3d8d004db94a60525051d2 Parents: 4e7459c Author: Andy Seaborne <[email protected]> Authored: Thu Mar 16 18:52:54 2017 +0000 Committer: Andy Seaborne <[email protected]> Committed: Thu Mar 16 18:52:54 2017 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/jena/atlas/web/TypedInputStream.java | 3 ++- jena-cmds/src/main/java/riotcmd/CmdLangParse.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/c83c8774/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java b/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java index 6e8e9d5..49af4c1 100644 --- a/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java +++ b/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java @@ -33,7 +33,7 @@ public class TypedInputStream extends FilterInputStream private String baseURI ; public static TypedInputStream wrap(InputStream in) { - //Soemtimes this is used to intentional loose the content type (in tests). + //Sometimes this is used to intentional loose the content type (in tests). // if ( in instanceof TypedInputStream ) { // return (TypedInputStream)in; // } @@ -66,6 +66,7 @@ public class TypedInputStream extends FilterInputStream public String getCharset() { return mediaType == null ? null : mediaType.getCharset() ; } public ContentType getMediaType() { return mediaType ; } public String getBaseURI() { return baseURI ; } + public InputStream getInputStream() { return super.in ; } @Override public void close() { http://git-wip-us.apache.org/repos/asf/jena/blob/c83c8774/jena-cmds/src/main/java/riotcmd/CmdLangParse.java ---------------------------------------------------------------------- diff --git a/jena-cmds/src/main/java/riotcmd/CmdLangParse.java b/jena-cmds/src/main/java/riotcmd/CmdLangParse.java index 22c290e..8b35cc3 100644 --- a/jena-cmds/src/main/java/riotcmd/CmdLangParse.java +++ b/jena-cmds/src/main/java/riotcmd/CmdLangParse.java @@ -250,6 +250,7 @@ public abstract class CmdLangParse extends CmdGeneral Lang lang = selectLang(filename, ct, RDFLanguages.NQUADS) ; if ( ! RDFLanguages.isQuads(lang) && ! RDFLanguages.isTriples(lang) ) throw new CmdException("Undefined language: "+lang) ; + builder.lang(lang); // Make a flag. // Input and output subflags. @@ -278,8 +279,10 @@ public abstract class CmdLangParse extends CmdGeneral modTime.startTimer() ; sink.start() ; + + builder.source(in); + RDFParser parser = builder.build(); try { - RDFParser parser = builder.build(); parser.parse(sink); successful = true; } catch (RiotException ex) {
