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 2009/07/29 17:30:42 UTC
svn commit: r798947 -
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java
Author: schor
Date: Wed Jul 29 15:30:42 2009
New Revision: 798947
URL: http://svn.apache.org/viewvc?rev=798947&view=rev
Log:
[UIMA-1465]
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java?rev=798947&r1=798946&r2=798947&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java Wed Jul 29 15:30:42 2009
@@ -41,6 +41,7 @@
import org.apache.uima.pear.tools.PackageBrowser;
import org.apache.uima.resource.PearSpecifier;
import org.apache.uima.resource.Resource;
+import org.apache.uima.resource.ResourceConfigurationException;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceManager;
import org.apache.uima.resource.ResourceManagerPearWrapper;
@@ -208,9 +209,12 @@
// Note: UimaContext can be null for a top level call to produceAnalysisEngine,
// where the descriptor is a Pear Resource.
- ResourceManager applicationRM = (ResourceManager) aAdditionalParams.get(Resource.PARAM_RESOURCE_MANAGER);
+
+ ResourceManager applicationRM = (aAdditionalParams == null) ? null :
+ (ResourceManager) aAdditionalParams.get(Resource.PARAM_RESOURCE_MANAGER);
if (null == applicationRM) {
- UimaContextAdmin uimaContext = (UimaContextAdmin)aAdditionalParams.get(Resource.PARAM_UIMA_CONTEXT);
+ UimaContextAdmin uimaContext = (aAdditionalParams == null) ? null :
+ (UimaContextAdmin)aAdditionalParams.get(Resource.PARAM_UIMA_CONTEXT);
if (null != uimaContext) {
applicationRM = uimaContext.getResourceManager();
}
@@ -245,7 +249,8 @@
ResourceSpecifier specifier = UIMAFramework.getXMLParser()
.parseResourceSpecifier(in);
- UimaContextAdmin uimaContext = (UimaContextAdmin) aAdditionalParams.get(Resource.PARAM_UIMA_CONTEXT);
+ UimaContextAdmin uimaContext = (aAdditionalParams == null) ? null :
+ (UimaContextAdmin) aAdditionalParams.get(Resource.PARAM_UIMA_CONTEXT);
if (null != uimaContext) {
((ChildUimaContext_impl)uimaContext).setPearResourceManager(innerRM);
}
@@ -255,7 +260,8 @@
// modified, and the aAdditionalParameters original object
// is re-used by the ASB_impl - a caller of this method,
// for other delegates.
- Map clonedAdditionalParameters = new HashMap(aAdditionalParams);
+ Map clonedAdditionalParameters = (aAdditionalParams == null) ?
+ new HashMap() : new HashMap(aAdditionalParams);
// clonedAdditionalParameters.remove(Resource.PARAM_UIMA_CONTEXT);
clonedAdditionalParameters.remove(Resource.PARAM_RESOURCE_MANAGER);
this.ae = UIMAFramework
@@ -348,7 +354,7 @@
this.ae.destroy();
}
- /*
+ /*
* (non-Javadoc)
*
* @see org.apache.uima.analysis_engine.impl.AnalysisEngineImplBase#setResultSpecification(org.apache.uima.analysis_engine.ResultSpecification)