svn commit: r561504 - in /incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima: impl/CustomResourceFactory_impl.java util/CasCreationUtils.java

[sc...@apache.org]

Author: schor
Date: Tue Jul 31 13:39:03 2007
New Revision: 561504

URL: http://svn.apache.org/viewvc?view=rev&rev=561504
Log:
[UIMA-520] Testing this fix made me see a long standing bug
in the CustomResourceFactory - the code to make use of the
ResourceManager was broken - it would get the loader if
there was one, but just throw it on the floor, instead of
putting it into the "loader" local variable.

Modified:
    incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CustomResourceFactory_impl.java
    incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CustomResourceFactory_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CustomResourceFactory_impl.java?view=diff&rev=561504&r1=561503&r2=561504
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CustomResourceFactory_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CustomResourceFactory_impl.java Tue Jul 31 13:39:03 2007
@@ -49,7 +49,7 @@
         resMgr = (ResourceManager)aAdditionalParams.get(Resource.PARAM_RESOURCE_MANAGER);
       }
       if (resMgr != null) {
-        resMgr.getExtensionClassLoader();
+        loader = resMgr.getExtensionClassLoader();
       }
       if (loader == null) {
         loader = this.getClass().getClassLoader();

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java?view=diff&rev=561504&r1=561503&r2=561504
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java Tue Jul 31 13:39:03 2007
@@ -61,6 +61,7 @@
 import org.apache.uima.resource.ResourceManager;
 import org.apache.uima.resource.ResourceSpecifier;
 import org.apache.uima.resource.URISpecifier;
+import org.apache.uima.resource.impl.ResourceManager_impl;
 import org.apache.uima.resource.metadata.AllowedValue;
 import org.apache.uima.resource.metadata.FeatureDescription;
 import org.apache.uima.resource.metadata.FsIndexCollection;
@@ -1639,9 +1640,11 @@
       } else if (current instanceof ResourceSpecifier) {
         //try to instantiate the resource
         Resource resource = null;
+        Map resourceMgrInMap = new HashMap();
+        resourceMgrInMap.put(Resource.PARAM_RESOURCE_MANAGER, aResourceManager);
         try {
           resource = UIMAFramework.produceResource((ResourceSpecifier) current,
-                  Collections.EMPTY_MAP);
+          		(null == aResourceManager) ? Collections.EMPTY_MAP : resourceMgrInMap);
         } catch (Exception e) {
           //failed.  If aOutputFailedRemotes is non-null, add an entry to it to it, else throw the exception.
           if (aOutputFailedRemotes != null) {