fixes

3 files changed, 4 insertions, 2 deletions

diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp
index 9b9f7dcebfb..0b8546ec818 100644
--- a/cpp/src/Ice/EventHandler.cpp
+++ b/cpp/src/Ice/EventHandler.cpp
@@ -22,7 +22,7 @@ void IceInternal::decRef(EventHandler* p) { p->__decRef(); }
 
 IceInternal::EventHandler::EventHandler(const InstancePtr& instance) :
     _instance(instance),
-    _stream(_instance) // Not instance! This must be _instance!
+    _stream(_instance) // Must be _instance, and not instance, because BasicStream does not duplicate the instance!
 {
 }
 
diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp
index 0536c84f823..bf1e80fa8ed 100644
--- a/cpp/src/Ice/StreamI.cpp
+++ b/cpp/src/Ice/StreamI.cpp
@@ -15,7 +15,8 @@ using namespace Ice;
 using namespace IceInternal;
 
 Ice::StreamI::StreamI(const InstancePtr& instance) :
-    _stream(instance)
+    _instance(instance),
+    _stream(_instance) // Must be _instance, and not instance, because BasicStream does not duplicate the instance!
 {
 }
 
diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h
index b793821eed9..ade7a0545ea 100644
--- a/cpp/src/Ice/StreamI.h
+++ b/cpp/src/Ice/StreamI.h
@@ -75,6 +75,7 @@ public:
 
 private:
 
+    ::IceInternal::InstancePtr _instance;
     ::IceInternal::BasicStream _stream;
 };