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 21:01:21 UTC
svn commit: r1765719 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima:
analysis_engine/impl/PearAnalysisEngineWrapper.java
resource/impl/ResourceManager_impl.java
Author: schor
Date: Wed Oct 19 21:01:20 2016
New Revision: 1765719
URL: http://svn.apache.org/viewvc?rev=1765719&view=rev
Log:
[UIMA-5146] merging from trunk the same change
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java (contents, props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java (contents, props changed)
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java?rev=1765719&r1=1765718&r2=1765719&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java Wed Oct 19 21:01:20 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();
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 21:01:20 2016
@@ -5,4 +5,4 @@
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java:933273-944396
/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java:1024030
-/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java:1690273-1765665
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java:1690273-1765718
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java?rev=1765719&r1=1765718&r2=1765719&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java Wed Oct 19 21:01:20 2016
@@ -235,7 +235,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,
@@ -245,10 +245,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;
}
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 21:01:20 2016
@@ -5,4 +5,4 @@
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java:933273-944396
/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java:1024030
-/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java:1690273-1765665
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java:1690273-1765718