Author: schor
Date: Mon Nov 5 18:26:29 2018
New Revision: 1845831
URL: http://svn.apache.org/viewvc?rev=1845831&view=rev
Log:
[UIMA-5902] merge from v2
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
(contents, props changed)
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java?rev=1845831&r1=1845830&r2=1845831&view=diff
==============================================================================
---
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
(original)
+++
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
Mon Nov 5 18:26:29 2018
@@ -49,7 +49,7 @@ public class RelativePathResolver_impl i
public RelativePathResolver_impl() {
this(null);
- mClassLoader = getClass().getClassLoader();
+ mClassLoader = getClass().getClassLoader(); // default value, maybe
overridden by setPathResolverClassLoader
}
public RelativePathResolver_impl(ClassLoader aClassLoader) {
@@ -142,17 +142,15 @@ public class RelativePathResolver_impl i
URL absURL;
if (mClassLoader != null) {
absURL = mClassLoader.getResource(f);
- } else // if no ClassLoader specified (could be the bootstrap
classloader), try the system
+ } else {// if no ClassLoader specified (could be the bootstrap
classloader), try the system
// classloader
- {
- absURL = ClassLoader.getSystemClassLoader().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 (absURL != null) {
- return absURL;
- }
-
- // no file could be found
- return null;
+ return absURL;
}
/**
Propchange:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 5 18:26:29 2018
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java:1690273-1845798
