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 2019/07/01 14:23:37 UTC
svn commit: r1862385 -
/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
Author: schor
Date: Mon Jul 1 14:23:37 2019
New Revision: 1862385
URL: http://svn.apache.org/viewvc?rev=1862385&view=rev
Log:
[UIMA-5935] add check to disallow operation if Resource Manager has been destroyed
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java (contents, props changed)
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java?rev=1862385&r1=1862384&r2=1862385&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java Mon Jul 1 14:23:37 2019
@@ -483,6 +483,7 @@ public class ResourceManager_impl implem
@Override
@SuppressWarnings("unchecked")
public Class<?> getResourceClass(String aName) {
+ checkDestroyed();
Object r = mResourceMap.get(aName);
if (r == null) // no such resource
{
@@ -913,6 +914,12 @@ public class ResourceManager_impl implem
}
}
+ // not clearing mResourcMap, mInternalResourceRegistrationMap, mParameterizedResourceImplClassMap,
+ // mInternalParameterizedResourceImplClassMap, mParameterizedResourceInstanceMap
+ // because these could be shared with other resource managers
+ // not clearing importCache, importUrlsCache - might be in used by other Resource Managers (shared)
+
+
// no destroy of caspool at this time
}
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 1 14:23:37 2019
@@ -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-1834899
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java:1690273-1862383