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 2014/08/07 16:22:18 UTC
svn commit: r1616494 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java
Author: cwiklik
Date: Thu Aug 7 14:22:18 2014
New Revision: 1616494
URL: http://svn.apache.org/r1616494
Log:
UIMA-3964 JDs and JPs should not register ShutdownHook. UIMA-AS does this already.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java?rev=1616494&r1=1616493&r2=1616494&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java Thu Aug 7 14:22:18 2014
@@ -39,6 +39,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Route;
+import org.apache.camel.Service;
import org.apache.camel.builder.RouteBuilder;
import org.apache.uima.ducc.common.admin.event.DuccAdminEvent;
import org.apache.uima.ducc.common.admin.event.DuccAdminEventKill;
@@ -335,9 +336,11 @@ public abstract class AbstractDuccCompon
}
System.getProperties().setProperty("ducc.jmx.url", processJmxUrl);
- ServiceShutdownHook shutdownHook = new ServiceShutdownHook(this, logger);
- // serviceDeployer);
- Runtime.getRuntime().addShutdownHook(shutdownHook);
+ if ( !System.getProperty("ducc.deploy.components").equals("uima-as")
+ && !System.getProperty("ducc.deploy.components").equals("jd")) {
+ ServiceShutdownHook shutdownHook = new ServiceShutdownHook(this, logger);
+ Runtime.getRuntime().addShutdownHook(shutdownHook);
+ }
// Register Ducc Component MBean with JMX.
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
@@ -378,6 +381,7 @@ public abstract class AbstractDuccCompon
logger.info(methodName, null, "Stopping Camel Context");
context.stop();
+
logger.info(methodName, null, "Camel Context Stopped");
ObjectName name = new ObjectName(