You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2016/09/01 18:47:04 UTC
svn commit: r1758835 -
/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java
Author: cwiklik
Date: Thu Sep 1 18:47:03 2016
New Revision: 1758835
URL: http://svn.apache.org/viewvc?rev=1758835&view=rev
Log:
UIMA-5023 on error during deploy remove spring context file unless user wants to keep it
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java
Modified: uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java?rev=1758835&r1=1758834&r2=1758835&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java Thu Sep 1 18:47:03 2016
@@ -832,11 +832,13 @@ public class BaseUIMAAsynchronousEngine_
*
*/
public String deploy(String aDeploymentDescriptor, Map anApplicationContext) throws Exception {
- String springContext = generateSpringContext(aDeploymentDescriptor, anApplicationContext);
+ String springContext = null;
+ try {
+ springContext = generateSpringContext(aDeploymentDescriptor, anApplicationContext);
- SpringContainerDeployer springDeployer = new SpringContainerDeployer(springContainerRegistry, this);
- try {
- String id = springDeployer.deploy(springContext);
+ SpringContainerDeployer springDeployer = new SpringContainerDeployer(springContainerRegistry, this);
+
+ String id = springDeployer.deploy(springContext);
if ( springDeployer.isInitialized() ) {
springDeployer.startListeners();
}
@@ -845,10 +847,10 @@ public class BaseUIMAAsynchronousEngine_
running = true;
throw e;
} finally {
- String uimaAsDebug = (String) anApplicationContext.get(UimaAsynchronousEngine.UimaEeDebug);
- if ( null == uimaAsDebug || uimaAsDebug.equals("")) {
+ String uimaAsDebug = (String) anApplicationContext.get(UimaAsynchronousEngine.UimaEeDebug);
+ if ( springContext != null && (null == uimaAsDebug || uimaAsDebug.equals("") ) ) {
disposeContextFiles(springContext);
- }
+ }
}
}
private void disposeContextFiles(String ...contextFiles) {