Author: andy
Date: Tue Dec 3 18:46:00 2013
New Revision: 1547524
URL: http://svn.apache.org/r1547524
Log:
Tidy syntax choosing; avoid possible NPE situation in
AdpaterFileManager.readModelWorker.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Closure.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Closure.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Closure.java?rev=1547524&r1=1547523&r2=1547524&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Closure.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Closure.java
Tue Dec 3 18:46:00 2013
@@ -227,7 +227,7 @@ public class Closure
}
}
- // Defines the reachable (on forwrd arcs) subgraph.
+ // Defines the reachable (on forward arcs) subgraph.
public static class ClosureReachable implements ClosureTest
{
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java?rev=1547524&r1=1547523&r2=1547524&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
(original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
Tue Dec 3 18:46:00 2013
@@ -305,6 +305,12 @@ public class RDFLanguages
return mapFileExtToLang.get(ext) ;
}
+ /** Try to map a resource name to a {@link Lang}; return null on no
registered mapping */
+ public static Lang resourceNameToLang(String resourceName) { return
filenameToLang(resourceName) ; }
+
+ /** Try to map a resource name to a {@link Lang}; return the given default
where there is no registered mapping */
+ public static Lang resourceNameToLang(String resourceName, Lang dftLang) {
return filenameToLang(resourceName, dftLang) ; }
+
/** Try to map a file name to a {@link Lang}; return null on no registered
mapping */
public static Lang filenameToLang(String filename)
{
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java?rev=1547524&r1=1547523&r2=1547524&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
Tue Dec 3 18:46:00 2013
@@ -270,12 +270,12 @@ public class AdapterFileManager extends
if ( log.isDebugEnabled() && !mappedURI.equals(filenameOrURI) )
log.debug("Map: " + filenameOrURI + " => " + mappedURI) ;
- // File extension preferred to content negotiation.
- // Compatibility.
- if ( syntax == null )
- syntax = RDFLanguages.guessContentType(mappedURI).getContentType()
;
-
- Lang lang = RDFLanguages.nameToLang(syntax) ;
+
+ Lang lang =
+ syntax != null
+ ? RDFLanguages.nameToLang(syntax)
+ : RDFLanguages.resourceNameToLang(mappedURI, Lang.RDFXML) ;
+
RDFDataMgr.read(model, mappedURI, baseURI, lang);
return model ;
}
