QPID-4905: Tidy-up remove OutputHandler and directly use FrameHandler

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

6 files changed, 12 insertions, 12 deletions

diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/cpp/src/qpid/client/ConnectionImpl.cpp
index 0abfbe09ec..dbb0a67d22 100644
--- a/cpp/src/qpid/client/ConnectionImpl.cpp
+++ b/cpp/src/qpid/client/ConnectionImpl.cpp
@@ -192,7 +192,7 @@ ConnectionImpl::ConnectionImpl(framing::ProtocolVersion v, const ConnectionSetti
       released(false)
 {
     handler.in = boost::bind(&ConnectionImpl::incoming, this, _1);
-    handler.out = boost::bind(&Connector::send, boost::ref(connector), _1);
+    handler.out = boost::bind(&Connector::handle, boost::ref(connector), _1);
     handler.onClose = boost::bind(&ConnectionImpl::closed, this,
                                   CLOSE_CODE_NORMAL, std::string());
     //only set error handler once  open
@@ -312,7 +312,7 @@ void ConnectionImpl::idleIn()
 void ConnectionImpl::idleOut()
 {
     AMQFrame frame((AMQHeartbeatBody()));
-    connector->send(frame);
+    connector->handle(frame);
 }
 
 void ConnectionImpl::close()
diff --git a/cpp/src/qpid/client/Connector.h b/cpp/src/qpid/client/Connector.h
index 16580f250c..1b5e59e06d 100644
--- a/cpp/src/qpid/client/Connector.h
+++ b/cpp/src/qpid/client/Connector.h
@@ -22,7 +22,7 @@
 #define _Connector_
 
 
-#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/FrameHandler.h"
 #include "qpid/framing/ProtocolVersion.h"
 
 #include <boost/shared_ptr.hpp>
@@ -49,7 +49,7 @@ struct ConnectionSettings;
 class ConnectionImpl;
 
 ///@internal
-class Connector : public framing::OutputHandler
+class Connector : public framing::FrameHandler
 {
   public:
     // Protocol connector factory related stuff (it might be better to separate this code from the TCP Connector in the future)
@@ -64,7 +64,7 @@ class Connector : public framing::OutputHandler
     virtual void connect(const std::string& host, const std::string& port) = 0;
     virtual void init() {};
     virtual void close() = 0;
-    virtual void send(framing::AMQFrame& frame) = 0;
+    virtual void handle(framing::AMQFrame& frame) = 0;
     virtual void abort() = 0;
 
     virtual void setInputHandler(framing::InputHandler* handler) = 0;
diff --git a/cpp/src/qpid/client/RdmaConnector.cpp b/cpp/src/qpid/client/RdmaConnector.cpp
index 618fcf9e0b..1689b7aee2 100644
--- a/cpp/src/qpid/client/RdmaConnector.cpp
+++ b/cpp/src/qpid/client/RdmaConnector.cpp
@@ -70,7 +70,7 @@ class RdmaConnector : public Connector, public sys::Codec
     sys::ShutdownHandler* shutdownHandler;
     framing::InputHandler* input;
     framing::InitiationHandler* initialiser;
-    framing::OutputHandler* output;
+    framing::FrameHandler* output;
 
     Rdma::AsynchIO* aio;
     Rdma::Connector* acon;
@@ -97,7 +97,7 @@ class RdmaConnector : public Connector, public sys::Codec
 
     void connect(const std::string& host, const std::string& port);
     void close();
-    void send(framing::AMQFrame& frame);
+    void handle(framing::AMQFrame& frame);
     void abort() {} // TODO: need to fix this for heartbeat timeouts to work
 
     void setInputHandler(framing::InputHandler* handler);
@@ -312,7 +312,7 @@ const std::string& RdmaConnector::getIdentifier() const {
     return identifier;
 }
 
-void RdmaConnector::send(AMQFrame& frame) {
+void RdmaConnector::handle(AMQFrame& frame) {
     // It is possible that we are called to write after we are already shutting down
     Mutex::ScopedLock l(dataConnectedLock);
     if (!dataConnected) return;
diff --git a/cpp/src/qpid/client/SslConnector.cpp b/cpp/src/qpid/client/SslConnector.cpp
index 59b17dc8f8..2e8842f24b 100644
--- a/cpp/src/qpid/client/SslConnector.cpp
+++ b/cpp/src/qpid/client/SslConnector.cpp
@@ -92,7 +92,7 @@ class SslConnector : public Connector
     void connectFailed(const std::string& msg);
 
     void close();
-    void send(framing::AMQFrame& frame);
+    void handle(framing::AMQFrame& frame);
     void abort();
     void connectAborted();
 
@@ -254,7 +254,7 @@ const std::string& SslConnector::getIdentifier() const {
     return identifier;
 }
 
-void SslConnector::send(AMQFrame& frame) {
+void SslConnector::handle(AMQFrame& frame) {
     bool notifyWrite = false;
     {
     Mutex::ScopedLock l(lock);
diff --git a/cpp/src/qpid/client/TCPConnector.cpp b/cpp/src/qpid/client/TCPConnector.cpp
index 777ba87348..2bdeec5b47 100644
--- a/cpp/src/qpid/client/TCPConnector.cpp
+++ b/cpp/src/qpid/client/TCPConnector.cpp
@@ -181,7 +181,7 @@ const std::string& TCPConnector::getIdentifier() const {
     return identifier;
 }
 
-void TCPConnector::send(AMQFrame& frame) {
+void TCPConnector::handle(AMQFrame& frame) {
     bool notifyWrite = false;
     {
     Mutex::ScopedLock l(lock);
diff --git a/cpp/src/qpid/client/TCPConnector.h b/cpp/src/qpid/client/TCPConnector.h
index 2a2fe031cd..20bd2fa5b8 100644
--- a/cpp/src/qpid/client/TCPConnector.h
+++ b/cpp/src/qpid/client/TCPConnector.h
@@ -78,7 +78,7 @@ class TCPConnector : public Connector, public sys::Codec
     void writeDataBlock(const framing::AMQDataBlock& data);
 
     void close();
-    void send(framing::AMQFrame& frame);
+    void handle(framing::AMQFrame& frame);
     void abort();
     void connectAborted();