Suppress the return of deleted objects for synchronous management get requests to the broker

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

1 files changed, 16 insertions, 12 deletions

diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/cpp/src/qpid/management/ManagementAgent.cpp
index 77277070d9..8dce82ba84 100644
--- a/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/cpp/src/qpid/management/ManagementAgent.cpp
@@ -821,12 +821,14 @@ void ManagementAgent::handleGetQueryLH (Buffer& inBuffer, string replyToKey, uin
             if (object->getConfigChanged() || object->getInstChanged())
                 object->setUpdateTime();
 
-            encodeHeader(outBuffer, 'g', sequence);
-            object->writeProperties(outBuffer);
-            object->writeStatistics(outBuffer, true);
-            outLen = MA_BUFFER_SIZE - outBuffer.available ();
-            outBuffer.reset ();
-            sendBuffer(outBuffer, outLen, dExchange, replyToKey);
+            if (!object->isDeleted()) {
+                encodeHeader(outBuffer, 'g', sequence);
+                object->writeProperties(outBuffer);
+                object->writeStatistics(outBuffer, true);
+                outLen = MA_BUFFER_SIZE - outBuffer.available ();
+                outBuffer.reset ();
+                sendBuffer(outBuffer, outLen, dExchange, replyToKey);
+            }
         }
         sendCommandComplete(replyToKey, sequence);
         return;
@@ -845,12 +847,14 @@ void ManagementAgent::handleGetQueryLH (Buffer& inBuffer, string replyToKey, uin
             if (object->getConfigChanged() || object->getInstChanged())
                 object->setUpdateTime();
 
-            encodeHeader(outBuffer, 'g', sequence);
-            object->writeProperties(outBuffer);
-            object->writeStatistics(outBuffer, true);
-            outLen = MA_BUFFER_SIZE - outBuffer.available ();
-            outBuffer.reset ();
-            sendBuffer(outBuffer, outLen, dExchange, replyToKey);
+            if (!object->isDeleted()) {
+                encodeHeader(outBuffer, 'g', sequence);
+                object->writeProperties(outBuffer);
+                object->writeStatistics(outBuffer, true);
+                outLen = MA_BUFFER_SIZE - outBuffer.available ();
+                outBuffer.reset ();
+                sendBuffer(outBuffer, outLen, dExchange, replyToKey);
+            }
         }
     }