Author: dejanb
Date: Thu Nov 12 11:35:03 2009
New Revision: 835342
URL: http://svn.apache.org/viewvc?rev=835342&view=rev
Log:
merging 835339 : https://issues.apache.org/activemq/browse/AMQ-2486 -
systemExitOnShutdown hangs
Modified:
activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
Modified:
activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
URL:
http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=835342&r1=835341&r2=835342&view=diff
==============================================================================
---
activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
(original)
+++
activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
Thu Nov 12 11:35:03 2009
@@ -435,7 +435,7 @@
if (systemExitOnShutdown) {
addShutdownHook(new Runnable() {
public void run() {
- System.exit(systemExitOnShutdownExitCode);
+ Runtime.getRuntime().halt(systemExitOnShutdownExitCode);
}
});
}