QPID-6125 : only log store exceptions that occur against a vhost which is no longer AVAILABLE

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

1 files changed, 12 insertions, 0 deletions

diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
index 89da98431e..5cf0ca4711 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
@@ -80,6 +80,7 @@ import org.apache.qpid.server.security.SubjectCreator;
 import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
 import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
 import org.apache.qpid.server.stats.StatisticsCounter;
+import org.apache.qpid.server.store.StoreException;
 import org.apache.qpid.server.util.Action;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
 import org.apache.qpid.server.util.ServerScopedRuntimeException;
@@ -344,6 +345,17 @@ public class AMQProtocolEngine implements ServerProtocolEngine,
                     _logger.error("I/O Exception", e);
                     closeProtocolSession();
                 }
+                catch (StoreException e)
+                {
+                    if(_virtualHost.getState() == State.ACTIVE)
+                    {
+                        throw e;
+                    }
+                    else
+                    {
+                        _logger.error("Store Exception ignored as virtual host no longer active", e);
+                    }
+                }
                 finally
                 {
                     _receivedLock.unlock();