1 files changed, 6 insertions, 0 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
index 0dbefd8798..16b85e67b3 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
@@ -48,6 +48,7 @@ import org.apache.qpid.framing.ProtocolVersion;
 import org.apache.qpid.server.configuration.ServerConfiguration;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
+import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.ssl.SSLContextFactory;
 
 /**
@@ -175,12 +176,17 @@ public class AMQPFastProtocolHandler extends IoHandlerAdapter
         {
             try
             {
+                CurrentActor.set(amqProtocolSession.getLogActor());
                 amqProtocolSession.closeSession();
             }
             catch (AMQException e)
             {
                 _logger.error("Caught AMQException whilst closingSession:" + e);
             }
+            finally
+            {
+                CurrentActor.remove();
+            }
         }
     }