QPID-3630: remove additional code in client.

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

3 files changed, 2 insertions, 93 deletions

diff --git a/cpp/src/qpid/broker/SessionState.cpp b/cpp/src/qpid/broker/SessionState.cpp
index 3371421bf7..99407bc3a6 100644
--- a/cpp/src/qpid/broker/SessionState.cpp
+++ b/cpp/src/qpid/broker/SessionState.cpp
@@ -25,7 +25,6 @@
 #include "qpid/broker/SessionManager.h"
 #include "qpid/broker/SessionHandler.h"
 #include "qpid/sys/ClusterSafe.h"
-#include "qpid/sys/Timer.h"
 #include "qpid/framing/AMQContentBody.h"
 #include "qpid/framing/AMQHeaderBody.h"
 #include "qpid/framing/AMQMethodBody.h"
@@ -33,7 +32,6 @@
 #include "qpid/framing/ServerInvoker.h"
 #include "qpid/log/Statement.h"
 #include "qpid/management/ManagementAgent.h"
-#include "qpid/framing/AMQP_ClientProxy.h"
 
 #include <boost/bind.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/cpp/src/qpid/client/SessionImpl.cpp b/cpp/src/qpid/client/SessionImpl.cpp
index 7cf4ef648e..9ac5323a53 100644
--- a/cpp/src/qpid/client/SessionImpl.cpp
+++ b/cpp/src/qpid/client/SessionImpl.cpp
@@ -62,7 +62,6 @@ SessionImpl::SessionImpl(const std::string& name, boost::shared_ptr<ConnectionIm
       proxy(ioHandler),
       nextIn(0),
       nextOut(0),
-      sendMsgCredit(0),
       doClearDeliveryPropertiesExchange(true),
       autoDetach(true)
 {
@@ -83,7 +82,6 @@ SessionImpl::~SessionImpl() {
             handleClosed();
             state.waitWaiters();
         }
-        delete sendMsgCredit;
     }
     connection->erase(channel);
 }
@@ -373,10 +371,6 @@ void SessionImpl::sendRawFrame(AMQFrame& frame) {
 
 Future SessionImpl::sendCommand(const AMQBody& command, const MethodContent* content)
 {
-    // Only message transfers have content
-    if (content && sendMsgCredit) {
-        sendMsgCredit->acquire();
-    }
     Acquire a(sendLock);
     SequenceNumber id = nextOut++;
     {
@@ -480,9 +474,7 @@ void SessionImpl::handleIn(AMQFrame& frame) // network thread
             //make sure the command id sequence and completion
             //tracking takes account of execution commands
             Lock l(state);
-            completedIn.add(nextIn++);            
-        } else if (invoke(static_cast<MessageHandler&>(*this), *frame.getBody())) {
-            ;
+            completedIn.add(nextIn++);
         } else {
             //if not handled by this class, its for the application:
             deliver(frame);
@@ -692,70 +684,6 @@ void SessionImpl::exception(uint16_t errorCode,
         setTimeout(0);
 }
 
-// Message methods:
-void SessionImpl::accept(const qpid::framing::SequenceSet&)
-{
-}
-
-void SessionImpl::reject(const qpid::framing::SequenceSet&, uint16_t, const std::string&)
-{
-}
-
-void SessionImpl::release(const qpid::framing::SequenceSet&, bool)
-{
-}
-
-MessageResumeResult SessionImpl::resume(const std::string&, const std::string&)
-{
-    throw NotImplementedException("resuming transfers not yet supported");
-}
-
-namespace {
-    const std::string QPID_SESSION_DEST = "";
-    const uint8_t FLOW_MODE_CREDIT = 0;
-    const uint8_t CREDIT_MODE_MSG = 0;
-}
-
-void SessionImpl::setFlowMode(const std::string& dest, uint8_t flowMode)
-{
-    if ( dest != QPID_SESSION_DEST ) {
-        QPID_LOG(warning, "Ignoring flow control for unknown destination: " << dest);
-        return;
-    }
-    
-    if ( flowMode != FLOW_MODE_CREDIT ) {
-        throw NotImplementedException("window flow control mode not supported by producer");
-    }
-    Lock l(state);
-    sendMsgCredit = new sys::Semaphore(0);
-}
-
-void SessionImpl::flow(const std::string& dest, uint8_t mode, uint32_t credit)
-{
-    if ( dest != QPID_SESSION_DEST ) {
-        QPID_LOG(warning, "Ignoring flow control for unknown destination: " << dest);
-        return;
-    }
-
-    if ( mode != CREDIT_MODE_MSG ) {
-        return;
-    }
-    if (sendMsgCredit) {
-        sendMsgCredit->release(credit);
-    }
-}
-
-void SessionImpl::stop(const std::string& dest)
-{
-    if ( dest != QPID_SESSION_DEST ) {
-        QPID_LOG(warning, "Ignoring flow control for unknown destination: " << dest);
-        return;
-    }
-    if (sendMsgCredit) {
-        sendMsgCredit->forceLock();
-    }
-}
-
 //private utility methods:
 
 inline void SessionImpl::setState(State s) //call with lock held
diff --git a/cpp/src/qpid/client/SessionImpl.h b/cpp/src/qpid/client/SessionImpl.h
index cd7b2c123d..4f9213a00a 100644
--- a/cpp/src/qpid/client/SessionImpl.h
+++ b/cpp/src/qpid/client/SessionImpl.h
@@ -62,8 +62,7 @@ class SessionHandler;
 class SessionImpl : public framing::FrameHandler::InOutHandler,
                     public Execution,
                     private framing::AMQP_ClientOperations::SessionHandler,
-                    private framing::AMQP_ClientOperations::ExecutionHandler,
-                    private framing::AMQP_ClientOperations::MessageHandler
+                    private framing::AMQP_ClientOperations::ExecutionHandler
 {
 public:
     SessionImpl(const std::string& name, boost::shared_ptr<ConnectionImpl>);
@@ -141,7 +140,6 @@ private:
     };
     typedef framing::AMQP_ClientOperations::SessionHandler SessionHandler;
     typedef framing::AMQP_ClientOperations::ExecutionHandler ExecutionHandler;
-    typedef framing::AMQP_ClientOperations::MessageHandler MessageHandler;
     typedef sys::StateMonitor<State, DETACHED> StateMonitor;
     typedef StateMonitor::Set States;
 
@@ -200,18 +198,6 @@ private:
                    uint8_t fieldIndex,
                    const std::string& description,
                    const framing::FieldTable& errorInfo);
-                   
-    // Note: Following methods are called by network thread in
-    // response to message commands from the broker
-    // EXCEPT Message.Transfer
-    void accept(const qpid::framing::SequenceSet&);
-    void reject(const qpid::framing::SequenceSet&, uint16_t, const std::string&);
-    void release(const qpid::framing::SequenceSet&, bool);
-    qpid::framing::MessageResumeResult resume(const std::string&, const std::string&);
-    void setFlowMode(const std::string&, uint8_t);
-    void flow(const std::string&, uint8_t, uint32_t);
-    void stop(const std::string&);
-
 
     sys::ExceptionHolder exceptionHolder;
     mutable StateMonitor state;
@@ -239,9 +225,6 @@ private:
 
     SessionState sessionState;
 
-    // Only keep track of message credit 
-    sys::Semaphore* sendMsgCredit;
-
     bool doClearDeliveryPropertiesExchange;
 
     bool autoDetach;