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/06/07 11:23:12 UTC
svn commit: r1347550 - in
/jena/trunk/jena-arq/src/main/java/org/openjena/riot: RiotLoader.java
RiotReader.java
Author: andy
Date: Thu Jun 7 09:23:12 2012
New Revision: 1347550
URL: http://svn.apache.org/viewvc?rev=1347550&view=rev
Log:
Fix: Parsing RDF/XML with a null baseURI caused an NPE.
Modified:
jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotLoader.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotLoader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotLoader.java?rev=1347550&r1=1347549&r2=1347550&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotLoader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotLoader.java Thu Jun 7 09:23:12 2012
@@ -215,20 +215,6 @@ public class RiotLoader
LangRIOT parser = RiotReader.createParserTriples(input, language, baseURI, sink) ;
parser.parse() ;
sink.flush();
-// LangRIOT parser ;
-// switch (language)
-// { case NTRIPLES :
-// parser = RiotReader.createParserNTriples(input, sink) ;
-// break ;
-// case TURTLE:
-// parser = RiotReader.createParserTurtle(input, baseURI, sink) ;
-// break ;
-// default:
-// throw new RiotException("Language not supported for triples: "+language) ;
-// }
-// parser.parse() ;
-// sink.flush();
-// return ;
}
// Better place?
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java?rev=1347550&r1=1347549&r2=1347550&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java Thu Jun 7 09:23:12 2012
@@ -141,7 +141,8 @@ public class RiotReader
{
if ( lang == RDFXML )
{
- baseIRI = IRIResolver.resolveString(baseIRI) ;
+ if ( baseIRI != null )
+ baseIRI = IRIResolver.resolveString(baseIRI) ;
return LangRDFXML.create(input, baseIRI, baseIRI, ErrorHandlerFactory.errorHandlerStd, sink) ;
}
Tokenizer tokenizer = ( lang == RDFJSON ) ?