QPID-3021: ensure the connection actor is used for connection control events regardless of a particular sessions existence

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1067208 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 14 insertions, 6 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
index d8b7c2e80e..d2addfde0c 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
@@ -149,15 +149,23 @@ public class ServerConnection extends Connection implements AMQConnectionModel,
     @Override
     public void received(ProtocolEvent event)
     {
-        ServerSession channel = (ServerSession) getSession(event.getChannel());
-        LogActor channelActor = null;
-
-        if (channel != null)
+        if (event.isConnectionControl())
+        {
+            CurrentActor.set(_actor);
+        }
+        else
         {
-            channelActor = channel.getLogActor();
+            ServerSession channel = (ServerSession) getSession(event.getChannel());
+            LogActor channelActor = null;
+
+            if (channel != null)
+            {
+                channelActor = channel.getLogActor();
+            }
+
+            CurrentActor.set(channelActor == null ? _actor : channelActor);
         }
 
-        CurrentActor.set(channelActor == null ? _actor : channelActor);
         try
         {
             super.received(event);