1 files changed, 2 insertions, 9 deletions
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h
index b8189cf7c9f..9df274b0101 100644
--- a/cpp/src/Ice/ConnectionI.h
+++ b/cpp/src/Ice/ConnectionI.h
@@ -31,7 +31,7 @@
 #include <Ice/OutgoingAsyncF.h>
 #include <Ice/EventHandler.h>
 #include <Ice/Dispatcher.h>
-#include <Ice/ObserverF.h>
+#include <Ice/ObserverHelper.h>
 
 #include <deque>
 #include <memory>
@@ -65,18 +65,12 @@ class LocalException;
 
 class ICE_API ConnectionI : public Connection, public IceInternal::EventHandler, public IceUtil::Monitor<IceUtil::Mutex>
 {
-    class Observer
+    class Observer : public IceInternal::ObserverHelperT<Ice::Instrumentation::ConnectionObserver>
     {
     public:
 
         Observer(const IceInternal::BasicStream&, const IceInternal::BasicStream&);
 
-        void setObserver(const Ice::Instrumentation::ConnectionObserverPtr&); 
-        const Ice::Instrumentation::ConnectionObserverPtr& getObserver() const
-        {
-            return _observer;
-        }
-
         void startRead();
         void finishRead();
         void startWrite();
@@ -84,7 +78,6 @@ class ICE_API ConnectionI : public Connection, public IceInternal::EventHandler,
 
     private:
 
-        Ice::Instrumentation::ConnectionObserverPtr _observer;
         Ice::Byte* _writeStreamPos;
         IceUtilInternal::StopWatch _writeWatch;
         Ice::Byte* _readStreamPos;