From 97449c36a04083484408907adcdfd81ecb63e7c1 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Thu, 2 Feb 2012 13:56:14 +0000
Subject: QPID-3784: introduce system property to run a dispatcher thread as
 damon/non-daemon thread. Changes dispatcher thread to be non daemon thread by
 default.

Applied patch from Andrew MacBean <andymacbean@gmail.com> and Oleksandr Rudyy<orudyy@gmail.com>.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1239620 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/qpid/client/AMQSession.java     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'java/client/src/main')

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 82ba04ddd3..f56f0c2747 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -387,6 +387,16 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
     /** Immediate message prefetch default. */
     public static final String IMMEDIATE_PREFETCH_DEFAULT = "false";
 
+    /**
+     * System property to enable allow dispatcher thread to be run as a daemon thread
+     */
+    public static final String DAEMON_DISPATCHER = "qpid.jms.daemon.dispatcher";
+
+    /**
+     * Flag indicating to start dispatcher as a daemon thread
+     */
+    protected final boolean DEAMON_DISPATCHER_THREAD = Boolean.getBoolean(DAEMON_DISPATCHER);
+
     /** The connection to which this session belongs. */
     private AMQConnection _connection;
 
@@ -2463,7 +2473,7 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
                 throw new Error("Error creating Dispatcher thread",e);
             }
             _dispatcherThread.setName("Dispatcher-Channel-" + _channelId);
-            _dispatcherThread.setDaemon(true);
+            _dispatcherThread.setDaemon(DEAMON_DISPATCHER_THREAD);
             _dispatcher.setConnectionStopped(initiallyStopped);
             _dispatcherThread.start();
             if (_dispatcherLogger.isInfoEnabled())
-- 
cgit v1.2.1