Merge pull request #396 from apache/bugfix/395-Potential-failure-to-l…

…ook-up-UIMA-internal-classes-in-OSGI-like-contexts

Issue #395: Potential failure to look up UIMA-internal classes in OSGI-like contexts

uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java

@@ -28,8 +28,8 @@
 import java.util.List;
 import java.util.StringTokenizer;
 
+import org.apache.uima.UIMAFramework;
 import org.apache.uima.cas.impl.FSClassRegistry;
-import org.apache.uima.cas.impl.FsGenerator3;
 import org.apache.uima.cas.impl.TypeSystemImpl;
 
 /**
@@ -248,11 +248,11 @@ protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundE
             c = findClass(name);
           }
         } catch (ClassNotFoundException e) {
-          if (name.startsWith(FsGenerator3.class.getPackage().getName() + ".")) {
+          if (isUimaInternalPackage(name)) {
             // There may be cases where the target class uses a classloader that has no access
             // to the UIMA internal classes - in particular to the FSGenerator3 - so we force using
             // the UIMA classloader in this case.
-            c = FsGenerator3.class.getClassLoader().loadClass(name);
+            c = UIMAFramework.class.getClassLoader().loadClass(name);
           } else {
             // delegate class loading for this class-name
             c = super.loadClass(name, false);
@@ -268,6 +268,11 @@ protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundE
     }
   }
 
+  private boolean isUimaInternalPackage(String name) {
+    return name.startsWith("org.apache.uima.cas.impl.")
+            || name.startsWith("org.apache.uima.jcas.cas.");
+  }
+
   /*
    * loads resource from this class loader first, if possible (non-Javadoc)
    *