3 files changed, 7 insertions, 7 deletions
diff --git a/cpp/lib/common/sys/apr/APRAcceptor.cpp b/cpp/lib/common/sys/apr/APRAcceptor.cpp
index 6853833797..10f787f4fe 100644
--- a/cpp/lib/common/sys/apr/APRAcceptor.cpp
+++ b/cpp/lib/common/sys/apr/APRAcceptor.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include <sys/Acceptor.h>
-#include <sys/SessionHandlerFactory.h>
+#include <sys/ConnectionInputHandlerFactory.h>
 #include "LFProcessor.h"
 #include "LFSessionContext.h"
 #include "APRBase.h"
@@ -33,7 +33,7 @@ class APRAcceptor : public Acceptor
   public:
     APRAcceptor(int16_t port, int backlog, int threads, bool trace);
     virtual int16_t getPort() const;
-    virtual void run(qpid::sys::SessionHandlerFactory* factory);
+    virtual void run(qpid::sys::ConnectionInputHandlerFactory* factory);
     virtual void shutdown();
 
   private:
@@ -75,7 +75,7 @@ int16_t APRAcceptor::getPort() const {
     return address->port;
 }
 
-void APRAcceptor::run(SessionHandlerFactory* factory) {
+void APRAcceptor::run(ConnectionInputHandlerFactory* factory) {
     running = true;
     processor.start();
     std::cout << "Listening on port " << getPort() << "..." << std::endl;
diff --git a/cpp/lib/common/sys/apr/LFSessionContext.cpp b/cpp/lib/common/sys/apr/LFSessionContext.cpp
index 7fb8d5a91b..43fc3de3dd 100644
--- a/cpp/lib/common/sys/apr/LFSessionContext.cpp
+++ b/cpp/lib/common/sys/apr/LFSessionContext.cpp
@@ -160,7 +160,7 @@ void LFSessionContext::shutdown(){
     handleClose();
 }
 
-void LFSessionContext::init(SessionHandler* _handler){
+void LFSessionContext::init(ConnectionInputHandler* _handler){
     handler = _handler;
     processor->add(&fd);
 }
diff --git a/cpp/lib/common/sys/apr/LFSessionContext.h b/cpp/lib/common/sys/apr/LFSessionContext.h
index 9483cbe590..8cf50b87ba 100644
--- a/cpp/lib/common/sys/apr/LFSessionContext.h
+++ b/cpp/lib/common/sys/apr/LFSessionContext.h
@@ -31,7 +31,7 @@
 #include <Buffer.h>
 #include <sys/Monitor.h>
 #include <sys/SessionContext.h>
-#include <sys/SessionHandler.h>
+#include <sys/ConnectionInputHandler.h>
 
 #include "APRSocket.h"
 #include "LFProcessor.h"
@@ -49,7 +49,7 @@ class LFSessionContext : public virtual qpid::sys::SessionContext
     qpid::framing::Buffer in;
     qpid::framing::Buffer out;
         
-    qpid::sys::SessionHandler* handler;
+    qpid::sys::ConnectionInputHandler* handler;
     LFProcessor* const processor;
 
     apr_pollfd_t fd;
@@ -74,7 +74,7 @@ class LFSessionContext : public virtual qpid::sys::SessionContext
     virtual void close();        
     void read();
     void write();
-    void init(qpid::sys::SessionHandler* handler);
+    void init(qpid::sys::ConnectionInputHandler* handler);
     void startProcessing();
     void stopProcessing();
     void handleClose();