svn commit: r1756963 - /uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/MsgLocalizationClassLoader.java

[schor]

Author: schor
Date: Fri Aug 19 20:07:05 2016
New Revision: 1756963

URL: http://svn.apache.org/viewvc?rev=1756963&view=rev
Log:
[UIMA-4793][UIMA-3692] make the same change for getResource

Modified:
    
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/MsgLocalizationClassLoader.java

Modified: 
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/MsgLocalizationClassLoader.java
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/MsgLocalizationClassLoader.java?rev=1756963&r1=1756962&r2=1756963&view=diff
==============================================================================
--- 
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/MsgLocalizationClassLoader.java
 (original)
+++ 
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/MsgLocalizationClassLoader.java
 Fri Aug 19 20:07:05 2016
@@ -145,8 +145,15 @@ public class MsgLocalizationClassLoader
           return c;
         }    
       }
-      // UIMA-3692  try the thread context class loader
+      // UIMA-3692, UIMA-4793  try the thread context class loader
       // if not found, will return class not found exception
+      ClassLoader cl = originalTccl.get();
+      if (cl != null) {
+        URL c = cl.getResource(name);
+        if (null != c) {
+          return c;
+        }
+      }
       return Thread.currentThread().getContextClassLoader().getResource(name);
     }
   }