Merge pull request #248 from apache/feature/247-RelativePathResolver-…

…should-consider-TCCL

Issue #247 - RelativePathResolver should consider TCCL

jVinci/.gitignore

@@ -1,2 +1,3 @@
 /.apt_generated/
 /.apt_generated_tests/
+/META-INF/

uimaj-adapter-vinci/.gitignore

@@ -1,2 +1,3 @@
 /.apt_generated/
 /.apt_generated_tests/
+/META-INF/

uimaj-core/.gitignore

@@ -1,2 +1,3 @@
 /.apt_generated/
 /.apt_generated_tests/
+/META-INF/

uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java

@@ -189,17 +189,22 @@ public URL resolveRelativePath(URL aRelativeUrl) {
 
     // fallback on classloader
     String f = aRelativeUrl.getFile();
-    URL absURL;
+    URL absURL = null;
     if (mClassLoader != null) {
       absURL = mClassLoader.getResource(f);
-    } else {// if no ClassLoader specified (could be the bootstrap classloader), try the system
-      // classloader
+    } 
+
+    // fallback on TCCL
+    if (absURL == null) {
+        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+        absURL = tccl.getResource(f);
+    }
 
-      // https://issues.apache.org/jira/browse/UIMA-5902
-      ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-      absURL = (tccl != null) ? tccl.getResource(f)
-              : ClassLoader.getSystemClassLoader().getResource(f);
+    // if no ClassLoader specified (could be the bootstrap classloader), try the system classloader
+    if (absURL == null && mClassLoader == null) {
+        absURL = ClassLoader.getSystemClassLoader().getResource(f);
     }
+
     return absURL;
   }
 

uimaj-cpe/.gitignore

@@ -3,3 +3,4 @@ checkpoint_synchPoint.xml
 checkpoint_synchPoint.xml.prev
 /.apt_generated/
 /.apt_generated_tests/
+/META-INF/

uimaj-tools/.gitignore

@@ -1,2 +1,3 @@
 /.apt_generated/
 /.apt_generated_tests/
+/META-INF/