You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/10/19 20:59:19 UTC

svn commit: r1765718 - in /uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima: analysis_engine/impl/PearAnalysisEngineWrapper.java resource/impl/ResourceManager_impl.java

Author: schor
Date: Wed Oct 19 20:59:19 2016
New Revision: 1765718

URL: http://svn.apache.org/viewvc?rev=1765718&view=rev
Log:
[UIMA-5146] change ResourceManager_impl copy method to no arg version, always sharing the caches

Modified:
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java?rev=1765718&r1=1765717&r2=1765718&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java Wed Oct 19 20:59:19 2016
@@ -112,7 +112,7 @@ public class PearAnalysisEngineWrapper e
        // could be null for top level Pear not in an aggregate
        rsrcMgr = UIMAFramework.newDefaultResourceManager();
      } else {
-       rsrcMgr = ((ResourceManager_impl) parentResourceManager).copy(true);
+       rsrcMgr = ((ResourceManager_impl) parentResourceManager).copy();
 //       newPearsParent.set((ResourceManager_impl) parentResourceManager);
 //       rsrcMgr = UIMAFramework.newDefaultResourceManagerPearWrapper();
 //       newPearsParent.remove();

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java?rev=1765718&r1=1765717&r2=1765718&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java Wed Oct 19 20:59:19 2016
@@ -193,7 +193,7 @@ public class ResourceManager_impl implem
     mRelativePathResolver = new RelativePathResolver_impl(); 
   }
   
-  public ResourceManager_impl copy(boolean allowClassPathChange) {
+  public ResourceManager_impl copy() {
     ResourceManager_impl rm = new ResourceManager_impl(
         this.mResourceMap,
         this.mInternalResourceRegistrationMap,
@@ -203,10 +203,8 @@ public class ResourceManager_impl implem
         );
     // non-final fields init
     rm.uimaCL = this.uimaCL;
-    if (!allowClassPathChange) {
-      rm.importCache = this.importCache;
-      rm.importUrlsCache = this.importUrlsCache;
-    }
+    rm.importCache = this.importCache;
+    rm.importUrlsCache = this.importUrlsCache;
     return rm; 
   }