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 15:37:35 UTC
svn commit: r1765666 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima:
analysis_engine/impl/PearAnalysisEngineWrapper.java
resource/impl/ResourceManagerPearWrapper_impl.java
resource/impl/ResourceManager_impl.java
Author: schor
Date: Wed Oct 19 15:37:35 2016
New Revision: 1765666
URL: http://svn.apache.org/viewvc?rev=1765666&view=rev
Log:
[UIMA-5146] merging from trunk the same change
Removed:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManagerPearWrapper_impl.java
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=1765666&r1=1765665&r2=1765666&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 15:37:35 2016
@@ -101,7 +101,8 @@ public class PearAnalysisEngineWrapper e
return result;
}
- public static final ThreadLocal<ResourceManager_impl> newPearsParent = new ThreadLocal<ResourceManager_impl>();
+ // Threadlocal trick replaced with call to ResourceManager_impl copy(true)
+// public static final ThreadLocal<ResourceManager_impl> newPearsParent = new ThreadLocal<ResourceManager_impl>();
private synchronized ResourceManager createRM(StringPair sp, PackageBrowser pkgBrowser, ResourceManager parentResourceManager)
throws MalformedURLException {
// create UIMA resource manager and apply pear settings
@@ -111,12 +112,14 @@ public class PearAnalysisEngineWrapper e
// could be null for top level Pear not in an aggregate
rsrcMgr = UIMAFramework.newDefaultResourceManager();
} else {
- newPearsParent.set((ResourceManager_impl) parentResourceManager);
- rsrcMgr = UIMAFramework.newDefaultResourceManagerPearWrapper();
- newPearsParent.remove();
+ rsrcMgr = ((ResourceManager_impl) parentResourceManager).copy(true);
+// newPearsParent.set((ResourceManager_impl) parentResourceManager);
+// rsrcMgr = UIMAFramework.newDefaultResourceManagerPearWrapper();
+// newPearsParent.remove();
// ((ResourceManagerPearWrapper)rsrcMgr).initializeFromParentResourceManager(parentResourceManager);
}
rsrcMgr.setExtensionClassPath(sp.classPath, true);
+ rsrcMgr.setCasManager(parentResourceManager.getCasManager()); // shares the same merged type system
UIMAFramework.getLogger(this.getClass()).logrb(
Level.CONFIG,
this.getClass().getName(),
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 19 15:37:35 2016
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java:961329-961745
+/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
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=1765666&r1=1765665&r2=1765666&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 15:37:35 2016
@@ -184,13 +184,13 @@ public class ResourceManager_impl implem
// Because internal users do a sync, only one thread at a time is using this
// (for internal calls) anyways, so there's no advantage to the extra overhead
// of making this a ConcurrentHashMap (March 2014)
- final private Map<String,XMLizable> importCache = Collections.synchronizedMap(new HashMap<String,XMLizable>());
+ private Map<String, XMLizable> importCache = Collections.synchronizedMap(new HashMap<String,XMLizable>());
/**
* Cache of imported descriptor URLs from which the parsed objects in importCache
* were created, so that these URLs are not re-parsed if the same URL is imported again.
*/
- final private Map<String,Set<String>> importUrlsCache = Collections.synchronizedMap(new HashMap<String,Set<String>>());
+ private Map<String, Set<String>> importUrlsCache = Collections.synchronizedMap(new HashMap<String,Set<String>>());
/**
* Creates a new <code>ResourceManager_impl</code>.
@@ -235,6 +235,24 @@ public class ResourceManager_impl implem
mRelativePathResolver = new RelativePathResolver_impl();
}
+ public ResourceManager_impl copy(boolean allowClassPathChange) {
+ ResourceManager_impl rm = new ResourceManager_impl(
+ this.mResourceMap,
+ this.mInternalResourceRegistrationMap,
+ this.mParameterizedResourceImplClassMap,
+ this.mInternalParameterizedResourceImplClassMap,
+ this.mParameterizedResourceInstanceMap
+ );
+ // non-final fields init
+ rm.uimaCL = this.uimaCL;
+ if (!allowClassPathChange) {
+ rm.importCache = this.importCache;
+ rm.importUrlsCache = this.importUrlsCache;
+ }
+ return rm;
+ }
+
+
/**
* Support reusing UIMA Class Loader instances to speed up
* things including the Component Description Editor when
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 19 15:37:35 2016
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java:961329-961745
+/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