svn commit: r1536015 - /jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java

[an...@apache.org]

Author: andy
Date: Sat Oct 26 18:10:11 2013
New Revision: 1536015

URL: http://svn.apache.org/r1536015
Log:
Improve handling of windows files with a drive letter.

Modified:
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java

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=1536015&r1=1536014&r2=1536015&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 Sat Oct 26 18:10:11 2013
@@ -265,8 +265,8 @@ public class AdapterFileManager extends 
 
     @Override
     protected Model readModelWorker(Model model, String filenameOrURI, String baseURI, String syntax) {
-        // Doesn't call open() - we want to make the synatx guess based on the
-        // mapped URI.
+        // Doesn't call open() - we want to make the syntax guess
+        // based on the mapped URI.
         String mappedURI = mapURI(filenameOrURI) ;
 
         if ( log.isDebugEnabled() && !mappedURI.equals(filenameOrURI) )
@@ -307,13 +307,10 @@ public class AdapterFileManager extends 
     }
 
     private static String chooseBaseURI(String baseURI) {
-        // Use IRILib.filenameToIRI
         String scheme = FileUtils.getScheme(baseURI) ;
-
-        if ( scheme != null && !scheme.equals("file") )
-            // Not file: - leave alone.
+        if ( scheme != null && scheme.length() > 1 && scheme.equals("file") )
+            // Not a file - leave alone.
             return baseURI ;
-
         return IRILib.filenameToIRI(baseURI) ;
     }