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 2016/11/15 17:22:01 UTC
[5/6] jena git commit: Use full IRI resolution for "file:" URIs.
Use full IRI resolution for "file:" URIs.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/974f5629
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/974f5629
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/974f5629
Branch: refs/heads/master
Commit: 974f5629928c5e255fb0097e9f1098892e460242
Parents: 968e24b
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Nov 15 16:25:45 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Nov 15 16:25:45 2016 +0000
----------------------------------------------------------------------
.../main/java/org/apache/jena/riot/system/IRIResolver.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/974f5629/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
index 7a199e1..bb5da0e 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
@@ -220,9 +220,9 @@ public abstract class IRIResolver
}
/**
- * Resolve a URI against a base. If baseStr is a relative file IRI
- * then it is first resolved against the current working directory.
- * If it is an absolute URI, it is normalized.
+ * Resolve a URI against the base for this process. If baseStr is a
+ * relative file IRI then it is first resolved against the current
+ * working directory. If it is an absolute URI, it is normalized.
*
* @param uriStr
* @return String An absolute URI
@@ -264,9 +264,6 @@ public abstract class IRIResolver
return globalResolver.getBaseIRI().create(i) ;
IRI base = iriFactory.create(baseStr) ;
-
- if ("file".equalsIgnoreCase(base.getScheme()))
- return globalResolver.getBaseIRI().create(i) ;
return base.create(i) ;
}