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 2017/09/05 16:08:11 UTC
svn commit: r1807367 -
/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
Author: schor
Date: Tue Sep 5 16:08:10 2017
New Revision: 1807367
URL: http://svn.apache.org/viewvc?rev=1807367&view=rev
Log:
[UIMA-5274] merge fix from 2/17/17
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java (contents, props changed)
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java?rev=1807367&r1=1807366&r2=1807367&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java Tue Sep 5 16:08:10 2017
@@ -194,35 +194,36 @@ public abstract class Resource_ImplBase
if (resMgrCfg != null) {
UimaContext prevContext = UimaContextHolder.setContext(mUimaContextAdmin);
try {
- resMgrCfg.resolveImports(getResourceManager());
- } catch (InvalidXMLException e) {
- UimaContextHolder.setContext(prevContext);
- throw new ResourceInitializationException(e);
- }
- if (aAdditionalParams == null) {
+ try {
+ resMgrCfg.resolveImports(getResourceManager());
+ } catch (InvalidXMLException e) {
+ throw new ResourceInitializationException(e);
+ }
+ if (aAdditionalParams == null) {
aAdditionalParams = new HashMap<String, Object>();
aAdditionalParams.put(PARAM_RESOURCE_MANAGER, mUimaContextAdmin.getResourceManager());
- } else {
- if (!aAdditionalParams.containsKey(PARAM_RESOURCE_MANAGER)) {
- // copy in case original is shared on multi-threads, or
- // is unmodifiable
- // and to avoid updating passed - in map
- aAdditionalParams = new HashMap<String, Object>(aAdditionalParams);
- aAdditionalParams.put(PARAM_RESOURCE_MANAGER, mUimaContextAdmin.getResourceManager());
+ } else {
+ if (!aAdditionalParams.containsKey(PARAM_RESOURCE_MANAGER)) {
+ // copy in case original is shared on multi-threads, or
+ // is unmodifiable
+ // and to avoid updating passed - in map
+ aAdditionalParams = new HashMap<String, Object>(aAdditionalParams);
+ aAdditionalParams.put(PARAM_RESOURCE_MANAGER, mUimaContextAdmin.getResourceManager());
+ }
}
+ // initializeExternalResources is synchronized
+
+ // https://issues.apache.org/jira/browse/UIMA-5153
+ final HashMap<String, Object> aAdditionalParmsForExtResources = new HashMap<String, Object>(aAdditionalParams); // copy in case
+ if (aAdditionalParmsForExtResources.get(PARAM_UIMA_CONTEXT) == null) {
+ aAdditionalParmsForExtResources.put(PARAM_UIMA_CONTEXT, mUimaContextAdmin);
+ }
+
+ mUimaContextAdmin.getResourceManager().initializeExternalResources(resMgrCfg,
+ mUimaContextAdmin.getQualifiedContextName(), aAdditionalParmsForExtResources);
+ } finally {
+ UimaContextHolder.setContext(prevContext);
}
- // initializeExternalResources is synchronized
-
- // https://issues.apache.org/jira/browse/UIMA-5153
- final HashMap<String, Object> aAdditionalParmsForExtResources = new HashMap<String, Object>(aAdditionalParams); // copy in case
- if (aAdditionalParmsForExtResources.get(PARAM_UIMA_CONTEXT) == null) {
- aAdditionalParmsForExtResources.put(PARAM_UIMA_CONTEXT, mUimaContextAdmin);
- }
-
- mUimaContextAdmin.getResourceManager().initializeExternalResources(resMgrCfg,
- mUimaContextAdmin.getQualifiedContextName(), aAdditionalParmsForExtResources);
-
- UimaContextHolder.setContext(prevContext);
}
// resolve and validate this component's external resource dependencies
Propchange: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 5 16:08:10 2017
@@ -5,4 +5,4 @@
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java:933273-944396
/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java:1024030
-/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java:1690273-1766687,1781464,1782182
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java:1690273-1807363