Merge pull request #139 from ndw/go-first

Resolve preferentially against the JAR file
docbook · Sep 14, 2019 · b836814 · b836814
2 parents f26b6f1 + 67de7e4
commit b836814
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -57,7 +57,7 @@ dependencies {
   compile (
     [group: 'net.sf.saxon', name: 'Saxon-HE', version: saxonVersion],
     [group: 'org.relaxng', name: 'jing', version: '20181222' ],
-    [group: 'org.xmlresolver', name: 'xmlresolver', version: '1.0.3'],
+    [group: 'org.xmlresolver', name: 'xmlresolver', version: '1.0.4'],
     [group: 'com.xmlcalabash', name: 'xmlcalabash', version: xmlCalabashVersion],
     [group: 'com.xmlcalabash', name: 'xmlcalabash1-gradle', version: '1.3.5'],
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.3.15
+version=2.3.16
 saxonVersion=9.9.1-4
 xmlCalabashVersion=1.1.27-99
 resourcesVersion=2.0.0

diff --git a/src/main/java/org/docbook/XSLT20.java b/src/main/java/org/docbook/XSLT20.java
@@ -347,10 +347,10 @@ private class DocBookResolver extends Resolver {
 
         @Override
         public Source resolve(String href, String base) throws TransformerException {
-            // We go last
-            Source src = nextResolver.resolve(href, base);
+            // We go first
+            Source src = resolver.resolve(href, base);
             if (src == null) {
-                return resolver.resolve(href, base);
+                return nextResolver.resolve(href, base);
             } else {
                 return src;
             }