1 files changed, 0 insertions, 4 deletions
diff --git a/cpp/src/qpid/broker/ConnectionAdapter.cpp b/cpp/src/qpid/broker/ConnectionAdapter.cpp
index 65933660f1..4fa4b2c238 100644
--- a/cpp/src/qpid/broker/ConnectionAdapter.cpp
+++ b/cpp/src/qpid/broker/ConnectionAdapter.cpp
@@ -50,14 +50,10 @@ void ConnectionAdapter::handleMethodInContext(
 )
 {
     try{
-        handler->client.setResponseTo(context.getRequestId());
         method->invoke(*this, context);
-        handler->client.setResponseTo(0);
     }catch(ConnectionException& e){
-        handler->client.setResponseTo(0);
         handler->client.close(e.code, e.toString(), method->amqpClassId(), method->amqpMethodId());
     }catch(std::exception& e){
-        handler->client.setResponseTo(0);
         handler->client.close(541/*internal error*/, e.what(), method->amqpClassId(), method->amqpMethodId());
     }
 }