Make management close session async

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1663314 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 57 insertions, 6 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionPrincipal.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionPrincipal.java
index 82ae9f6454..237a5b4069 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionPrincipal.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionPrincipal.java
@@ -20,11 +20,12 @@
  */
 package org.apache.qpid.server.connection;
 
+import java.net.SocketAddress;
+
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.protocol.AMQConnectionModel;
 import org.apache.qpid.server.security.auth.SocketConnectionPrincipal;
 
-import java.net.SocketAddress;
-
 public class ConnectionPrincipal implements SocketConnectionPrincipal
 {
     private final AMQConnectionModel _connection;
@@ -51,6 +52,11 @@ public class ConnectionPrincipal implements SocketConnectionPrincipal
         return _connection;
     }
 
+    public VirtualHost<?,?,?> getVirtualHost()
+    {
+        return _connection.getVirtualHost();
+    }
+
     @Override
     public boolean equals(final Object o)
     {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/log4j/VirtualHostAppender.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/log4j/VirtualHostAppender.java
new file mode 100644
index 0000000000..25887ef701
--- /dev/null
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/log4j/VirtualHostAppender.java
@@ -0,0 +1,46 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.logging.log4j;
+
+import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.spi.LoggingEvent;
+
+public class VirtualHostAppender extends AppenderSkeleton
+{
+    @Override
+    protected void append(final LoggingEvent event)
+    {
+        getLayout().format(event);
+        final Object virtualhost = event.getMDC("virtualhost");
+    }
+
+    @Override
+    public void close()
+    {
+
+    }
+
+    @Override
+    public boolean requiresLayout()
+    {
+        return false;
+    }
+}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
index 64cfc39e1a..eae438754b 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
@@ -184,7 +184,6 @@ public final class ConnectionAdapter extends AbstractConfiguredObject<Connection
             @Override
             public void performAction(final Object object)
             {
-                LOGGER.debug("KWDEBUG underlying connection deleted");
                 closeFuture.connectionClosed();
             }
         });
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java
index 50cfba5bec..95b9bf8970 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java
@@ -53,7 +53,7 @@ public interface AMQConnectionModel<T extends AMQConnectionModel<T,S>, S extends
      * @param cause
      * @param message
      */
-    public void closeSession(S session, AMQConstant cause, String message);
+    public void closeSessionAsync(S session, AMQConstant cause, String message);
 
     public long getConnectionId();
 
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java
index 1c7cf9d566..eafc969496 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java
@@ -543,8 +543,8 @@ public class MockConsumer implements ConsumerTarget
         }
 
         @Override
-        public void closeSession(AMQSessionModel session, AMQConstant cause,
-                String message)
+        public void closeSessionAsync(AMQSessionModel session, AMQConstant cause,
+                                      String message)
         {
         }