fixes

12 files changed, 127 insertions, 106 deletions

diff --git a/cpp/src/Ice/.depend b/cpp/src/Ice/.depend
index b9c0811e176..f53ba75a783 100644
--- a/cpp/src/Ice/.depend
+++ b/cpp/src/Ice/.depend
@@ -48,8 +48,8 @@ ProxyFactory.o: ProxyFactory.cpp ../Ice/ProxyFactory.h ../../include/IceUtil/Sha
 Proxy.o: Proxy.cpp ../../include/IceUtil/Thread.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../Ice/ProxyFactory.h ../../include/Ice/InstanceF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Direct.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/LoggerF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/LocatorInfoF.h ../../include/Ice/OutgoingAsync.h ../Ice/Reference.h ../Ice/ReferenceFactoryF.h ../Ice/RouterInfoF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/PropertiesF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/ThreadPoolF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/LoggerUtil.h ../Ice/TraceLevels.h ../Ice/ConnectionFactory.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Connection.h ../Ice/RouterInfo.h ../../include/Ice/RoutingTableF.h ../Ice/LocatorInfo.h ../../include/Ice/LocalException.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
 Outgoing.o: Outgoing.cpp ../../include/Ice/Outgoing.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ConnectionF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../Ice/Connection.h ../../include/IceUtil/RecMutex.h ../../include/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../../include/Ice/EndpointF.h ../Ice/ThreadPoolF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/OutgoingAsyncF.h ../Ice/DefaultsAndOverridesF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Reference.h ../Ice/ReferenceFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Direct.h ../../include/Ice/LocatorF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../../include/Ice/LocalException.h
 OutgoingAsync.o: OutgoingAsync.cpp ../../include/Ice/OutgoingAsync.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ConnectionF.h ../../include/Ice/ReferenceF.h ../../include/Ice/InstanceF.h ../../include/Ice/Current.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/IncomingAsyncF.h ../Ice/Connection.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../../include/Ice/EndpointF.h ../Ice/ThreadPoolF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../Ice/Reference.h ../Ice/ReferenceFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Outgoing.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Direct.h ../../include/Ice/LocatorF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LoggerUtil.h
-Incoming.o: Incoming.cpp ../../include/Ice/Incoming.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ConnectionF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EndpointF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Direct.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/ServantLocator.h ../Ice/Connection.h ../../include/IceUtil/RecMutex.h ../../include/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../Ice/ThreadPoolF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/IdentityUtil.h ../../include/Ice/LoggerUtil.h ../Ice/StringUtil.h ../Ice/Protocol.h
-IncomingAsync.o: IncomingAsync.cpp ../../include/Ice/IncomingAsync.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ConnectionF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/ServantLocator.h ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/Incoming.h ../Ice/Connection.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../../include/Ice/EndpointF.h ../Ice/ThreadPoolF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/OutgoingAsyncF.h ../Ice/DefaultsAndOverridesF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/LocalException.h ../Ice/Protocol.h
+Incoming.o: Incoming.cpp ../../include/Ice/Incoming.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ConnectionF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EndpointF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Direct.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/ServantLocator.h ../Ice/Connection.h ../../include/IceUtil/RecMutex.h ../../include/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../Ice/ThreadPoolF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/IdentityUtil.h ../../include/Ice/LoggerUtil.h ../Ice/StringUtil.h ../Ice/Protocol.h
+IncomingAsync.o: IncomingAsync.cpp ../../include/Ice/IncomingAsync.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/Incoming.h ../../include/Ice/InstanceF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/ServantLocator.h ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../Ice/Connection.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../../include/Ice/EndpointF.h ../Ice/ThreadPoolF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../../include/Ice/OutgoingAsyncF.h ../Ice/DefaultsAndOverridesF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/LocalException.h ../Ice/Protocol.h
 Direct.o: Direct.cpp ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/LoggerF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/LocatorInfoF.h ../../include/Ice/ServantLocator.h ../Ice/Reference.h ../Ice/ReferenceFactoryF.h ../Ice/RouterInfoF.h ../../include/Ice/LocalException.h
 Network.o: Network.cpp ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../Ice/Network.h ../../include/Ice/Config.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h
 ThreadPool.o: ThreadPool.cpp ../Ice/ThreadPool.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Handle.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../Ice/EventHandlerF.h ../Ice/EventHandler.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../Ice/Network.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Properties.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Direct.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/Protocol.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index c2264742437..2d491777b6a 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -31,14 +31,14 @@ const string IceInternal::BasicStream::_emptyString;
 const string IceInternal::BasicStream::_iceObjectId("::Ice::Object");
 const string IceInternal::BasicStream::_userExceptionId("::Ice::UserException");
 
-IceInternal::BasicStream::BasicStream(const InstancePtr& instance) :
+IceInternal::BasicStream::BasicStream(Instance* instance) :
     _instance(instance),
     _currentReadEncaps(0),
     _currentWriteEncaps(0)
 {
 }
 
-const InstancePtr&
+Instance*
 IceInternal::BasicStream::instance() const
 {
     return _instance;
@@ -47,7 +47,7 @@ IceInternal::BasicStream::instance() const
 void
 IceInternal::BasicStream::swap(BasicStream& other)
 {
-    assert(_instance.get() == other._instance.get());
+    assert(_instance == other._instance);
 
     b.swap(other.b);
     std::swap(i, other.i);
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp
index a235d876e65..ca3446f5e29 100644
--- a/cpp/src/Ice/Connection.cpp
+++ b/cpp/src/Ice/Connection.cpp
@@ -124,7 +124,7 @@ IceInternal::Connection::validate()
 		// Incoming connections play the active role with respect to
 		// connection validation.
 		//
-		BasicStream os(_instance);
+		BasicStream os(_instance.get());
 		os.write(protocolVersion);
 		os.write(encodingVersion);
 		os.write(validateConnectionMsg);
@@ -139,7 +139,7 @@ IceInternal::Connection::validate()
 		// Outgoing connection play the passive role with respect to
 		// connection validation.
 		//
-		BasicStream is(_instance);
+		BasicStream is(_instance.get());
 		is.b.resize(headerSize);
 		is.i = is.b.begin();
 		_transceiver->read(is, _endpoint->timeout());
@@ -270,7 +270,7 @@ IceInternal::Connection::sendRequest(Outgoing* out, bool oneway, bool compress)
 	    //
 	    // Do compression.
 	    //
-	    BasicStream cstream(_instance);
+	    BasicStream cstream(_instance.get());
 	    doCompress(*os, cstream);
 	    
 	    //
@@ -368,7 +368,7 @@ IceInternal::Connection::sendAsyncRequest(const OutgoingAsyncPtr& out, bool comp
 	    //
 	    // Do compression.
 	    //
-	    BasicStream cstream(_instance);
+	    BasicStream cstream(_instance.get());
 	    doCompress(*os, cstream);
 	    
 	    //
@@ -510,7 +510,7 @@ IceInternal::Connection::flushBatchRequest(bool compress)
 	    //
 	    // Do compression.
 	    //
-	    BasicStream cstream(_instance);
+	    BasicStream cstream(_instance.get());
 	    doCompress(_batchStream, cstream);
 	    
 	    //
@@ -543,7 +543,7 @@ IceInternal::Connection::flushBatchRequest(bool compress)
 	// Reset _batchStream and _batchRequestNum, so that new batch
 	// messages can be sent.
 	//
-	BasicStream dummy(_instance);
+	BasicStream dummy(_instance.get());
 	_batchStream.swap(dummy);
 	assert(_batchStream.b.empty());
 	_batchRequestNum = 0;
@@ -590,7 +590,7 @@ IceInternal::Connection::sendResponse(BasicStream* os, bool compress)
 	    //
 	    // Do compression.
 	    //
-	    BasicStream cstream(_instance);
+	    BasicStream cstream(_instance.get());
 	    doCompress(*os, cstream);
 	    
 	    //
@@ -763,7 +763,7 @@ IceInternal::Connection::message(BasicStream& stream, const ThreadPoolPtr& threa
 	       messageType == compressedRequestBatchMsg ||
 	       messageType == compressedReplyMsg)
 	    {
-		BasicStream ustream(_instance);
+		BasicStream ustream(_instance.get());
 		doUncompress(stream, ustream);
 		stream.b.swap(ustream.b);
 		compress = true;
@@ -1003,7 +1003,7 @@ IceInternal::Connection::message(BasicStream& stream, const ThreadPoolPtr& threa
 	// Prepare the invocation.
 	//
 	bool response = !_endpoint->datagram() && requestId != 0;
-	Incoming in(_instance, _adapter, this, response, compress);
+	Incoming in(_instance.get(), this, _adapter, response, compress);
 	BasicStream* is = in.is();
 	stream.swap(*is);
 	BasicStream* os = in.os();
@@ -1094,7 +1094,7 @@ IceInternal::Connection::Connection(const InstancePtr& instance,
     _nextRequestId(1),
     _requestsHint(_requests.end()),
     _asyncRequestsHint(_asyncRequests.end()),
-    _batchStream(_instance),
+    _batchStream(_instance.get()),
     _batchRequestNum(0),
     _dispatchCount(0),
     _proxyCount(0),
@@ -1269,7 +1269,7 @@ IceInternal::Connection::initiateShutdown() const
 	//
 	// Before we shut down, we send a close connection message.
 	//
-	BasicStream os(_instance);
+	BasicStream os(_instance.get());
 	os.write(protocolVersion);
 	os.write(encodingVersion);
 	os.write(closeConnectionMsg);
diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp
index bb21abc7862..1e51aceaa10 100644
--- a/cpp/src/Ice/EventHandler.cpp
+++ b/cpp/src/Ice/EventHandler.cpp
@@ -26,7 +26,7 @@ void IceInternal::decRef(EventHandler* p) { p->__decRef(); }
 
 IceInternal::EventHandler::EventHandler(const InstancePtr& instance) :
     _instance(instance),
-    _stream(_instance) // Must be _instance, and not instance, because BasicStream does not duplicate the instance!
+    _stream(_instance.get())
 {
 }
 
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 8a2d066ebb7..77140d1e6a5 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -29,8 +29,8 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
-IceInternal::Incoming::Incoming(const InstancePtr& instance, const ObjectAdapterPtr& adapter, Connection* connection,
-				bool response, bool compress) :
+IceInternal::IncomingBase::IncomingBase(Instance* instance, Connection* connection, const ObjectAdapterPtr& adapter,
+					bool response, bool compress) :
     _connection(connection),
     _response(response),
     _compress(compress),
@@ -40,6 +40,83 @@ IceInternal::Incoming::Incoming(const InstancePtr& instance, const ObjectAdapter
     _current.adapter = adapter;
 }
 
+IceInternal::IncomingBase::IncomingBase(IncomingBase& in) :
+    _current(in._current),
+    _servant(in._servant),
+    _locator(in._locator),
+    _cookie(in._cookie),
+    _connection(in._connection),
+    _response(in._response),
+    _compress(in._compress),
+    _is(in._is.instance()),
+    _os(in._os.instance())
+{
+    _is.swap(in._is);
+    _os.swap(in._os);
+}
+
+void
+IceInternal::IncomingBase::__finishInvoke()
+{
+    if(_locator && _servant)
+    {
+	_locator->finished(_current, _servant, _cookie);
+    }
+
+    _is.endReadEncaps();
+
+    //
+    // Send a response if necessary. If we don't need to send a
+    // response, we still need to tell the connection that we're
+    // finished with dispatching.
+    //
+    if(_response)
+    {
+	_connection->sendResponse(&_os, _compress);
+    }
+    else
+    {
+	_connection->sendNoResponse();
+    }
+}
+
+void
+IceInternal::IncomingBase::__warning(const Exception& ex) const
+{
+    ostringstream str;
+    str << ex;
+    __warning(str.str());
+}
+
+void
+IceInternal::IncomingBase::__warning(const string& msg) const
+{
+    if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 1)
+    {
+	Warning out(_os.instance()->logger());
+	
+	out << "dispatch exception: " << msg;
+	out << "\nidentity: " << _current.id;
+	out << "\nfacet: ";
+	vector<string>::const_iterator p = _current.facet.begin();
+	while(p != _current.facet.end())
+	{
+	    out << encodeString(*p++, "/");
+	    if(p != _current.facet.end())
+	    {
+		out << '/';
+	    }
+	}
+	out << "\noperation: " << _current.operation;
+    }
+}
+
+IceInternal::Incoming::Incoming(Instance* instance, Connection* connection, const ObjectAdapterPtr& adapter,
+				bool response, bool compress) :
+    IncomingBase(instance, connection, adapter, response, compress)
+{
+}
+
 void
 IceInternal::Incoming::invoke()
 {
@@ -131,7 +208,7 @@ IceInternal::Incoming::invoke()
 	    {
 		//
 		// If this was an asynchronous dispatch, we're done
-		// here.  We do *not* call finishInvoke(), because the
+		// here.  We do *not* call __finishInvoke(), because the
 		// call is not finished yet.
 		//
 		assert(status == DispatchOK);
@@ -156,7 +233,7 @@ IceInternal::Incoming::invoke()
 	    ex.operation = _current.operation;
 	}
 
-	warning(ex);
+	__warning(ex);
 
 	if(_response)
 	{
@@ -183,12 +260,12 @@ IceInternal::Incoming::invoke()
 	    _os.write(ex.operation);
 	}
 
-	finishInvoke();
+	__finishInvoke();
 	return;
     }
     catch(const LocalException& ex)
     {
-	warning(ex);
+	__warning(ex);
 
 	if(_response)
 	{
@@ -200,12 +277,12 @@ IceInternal::Incoming::invoke()
 	    _os.write(str.str());
 	}
 
-	finishInvoke();
+	__finishInvoke();
 	return;
     }
     catch(const UserException& ex)
     {
-	warning(ex);
+	__warning(ex);
 
 	if(_response)
 	{
@@ -217,12 +294,12 @@ IceInternal::Incoming::invoke()
 	    _os.write(str.str());
 	}
 
-	finishInvoke();
+	__finishInvoke();
 	return;
     }
     catch(const Exception& ex)
     {
-	warning(ex);
+	__warning(ex);
 
 	if(_response)
 	{
@@ -234,12 +311,12 @@ IceInternal::Incoming::invoke()
 	    _os.write(str.str());
 	}
 
-	finishInvoke();
+	__finishInvoke();
 	return;
     }
     catch(const std::exception& ex)
     {
-	warning(string("std::exception: ") + ex.what());
+	__warning(string("std::exception: ") + ex.what());
 
 	if(_response)
 	{
@@ -251,12 +328,12 @@ IceInternal::Incoming::invoke()
 	    _os.write(str.str());
 	}
 
-	finishInvoke();
+	__finishInvoke();
 	return;
     }
     catch(...)
     {
-	warning("unknown c++ exception");
+	__warning("unknown c++ exception");
 
 	if(_response)
 	{
@@ -267,7 +344,7 @@ IceInternal::Incoming::invoke()
 	    _os.write(reason);
 	}
 
-	finishInvoke();
+	__finishInvoke();
 	return;
     }
 
@@ -300,7 +377,7 @@ IceInternal::Incoming::invoke()
 	}
     }
 
-    finishInvoke();
+    __finishInvoke();
 }
 
 BasicStream*
@@ -314,59 +391,3 @@ IceInternal::Incoming::os()
 {
     return &_os;
 }
-
-void
-IceInternal::Incoming::finishInvoke()
-{
-    if(_locator && _servant)
-    {
-	_locator->finished(_current, _servant, _cookie);
-    }
-
-    _is.endReadEncaps();
-
-    //
-    // Send a response if necessary. If we don't need to send a
-    // response, we still need to tell the connection that we're
-    // finished with dispatching.
-    //
-    if(_response)
-    {
-	_connection->sendResponse(&_os, _compress);
-    }
-    else
-    {
-	_connection->sendNoResponse();
-    }
-}
-
-void
-IceInternal::Incoming::warning(const Exception& ex) const
-{
-    ostringstream str;
-    str << ex;
-    warning(str.str());
-}
-
-void
-IceInternal::Incoming::warning(const string& msg) const
-{
-    if(_os.instance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 1)
-    {
-	Warning out(_os.instance()->logger());
-	
-	out << "dispatch exception: " << msg;
-	out << "\nidentity: " << _current.id;
-	out << "\nfacet: ";
-	vector<string>::const_iterator p = _current.facet.begin();
-	while(p != _current.facet.end())
-	{
-	    out << encodeString(*p++, "/");
-	    if(p != _current.facet.end())
-	    {
-		out << '/';
-	    }
-	}
-	out << "\noperation: " << _current.operation;
-    }
-}
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp
index 5ab8b466e53..476a7dbf23d 100644
--- a/cpp/src/Ice/IncomingAsync.cpp
+++ b/cpp/src/Ice/IncomingAsync.cpp
@@ -31,8 +31,8 @@ void IceInternal::decRef(AMD_Object_ice_invoke* p) { p->__decRef(); }
 
 IceInternal::IncomingAsync::IncomingAsync(Incoming& in) :
     IncomingBase(in),
-    _instance(_is.instance()),
-    _connection(_connection)
+    _instanceCopy(_is.instance()),
+    _connectionCopy(_connection)
 {
 }
 
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index 512325d0fa5..fb773895b89 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -39,13 +39,13 @@ IceInternal::NonRepeatable::get() const
     return _ex.get();
 }
 
-IceInternal::Outgoing::Outgoing(const ConnectionPtr& connection, const ReferencePtr& ref, const string& operation,
+IceInternal::Outgoing::Outgoing(Connection* connection, Reference* ref, const string& operation,
 				OperationMode mode, const Context& context) :
     _connection(connection),
     _reference(ref),
     _state(StateUnsent),
-    _is(ref->instance),
-    _os(ref->instance)
+    _is(ref->instance.get()),
+    _os(ref->instance.get())
 {
     switch(_reference->mode)
     {
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index 55f396200e1..bc7727cd933 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -52,8 +52,8 @@ IceInternal::OutgoingAsync::__setup(const ConnectionPtr& connection, const Refer
     _instance = ref->instance;
     delete _is;
     delete _os;
-    _is = new BasicStream(_instance);
-    _os = new BasicStream(_instance);
+    _is = new BasicStream(_instance.get());
+    _os = new BasicStream(_instance.get());
 
     _connection->prepareRequest(_os);
     
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index a369a9b1f16..711d4a37427 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -776,7 +776,7 @@ bool
 IceDelegateM::Ice::Object::ice_isA(const string& __id, const Context& __context)
 {
     static const string __operation("ice_isA");
-    Outgoing __out(__connection, __reference, __operation, ::Ice::Nonmutating, __context);
+    Outgoing __out(__connection.get(), __reference.get(), __operation, ::Ice::Nonmutating, __context);
     BasicStream* __is = __out.is();
     BasicStream* __os = __out.os();
     __os->write(__id);
@@ -793,7 +793,7 @@ void
 IceDelegateM::Ice::Object::ice_ping(const Context& __context)
 {
     static const string __operation("ice_ping");
-    Outgoing __out(__connection, __reference, __operation, ::Ice::Nonmutating, __context);
+    Outgoing __out(__connection.get(), __reference.get(), __operation, ::Ice::Nonmutating, __context);
     if(!__out.invoke())
     {
 	throw ::Ice::UnknownUserException(__FILE__, __LINE__);
@@ -804,7 +804,7 @@ vector<string>
 IceDelegateM::Ice::Object::ice_ids(const Context& __context)
 {
     static const string __operation("ice_ids");
-    Outgoing __out(__connection, __reference, __operation, ::Ice::Nonmutating, __context);
+    Outgoing __out(__connection.get(), __reference.get(), __operation, ::Ice::Nonmutating, __context);
     BasicStream* __is = __out.is();
     if(!__out.invoke())
     {
@@ -819,7 +819,7 @@ string
 IceDelegateM::Ice::Object::ice_id(const Context& __context)
 {
     static const string __operation("ice_id");
-    Outgoing __out(__connection, __reference, __operation, ::Ice::Nonmutating, __context);
+    Outgoing __out(__connection.get(), __reference.get(), __operation, ::Ice::Nonmutating, __context);
     BasicStream* __is = __out.is();
     if(!__out.invoke())
     {
@@ -834,7 +834,7 @@ FacetPath
 IceDelegateM::Ice::Object::ice_facets(const Context& __context)
 {
     static const string __operation("ice_facets");
-    Outgoing __out(__connection, __reference, __operation, ::Ice::Nonmutating, __context);
+    Outgoing __out(__connection.get(), __reference.get(), __operation, ::Ice::Nonmutating, __context);
     BasicStream* __is = __out.is();
     if(!__out.invoke())
     {
@@ -852,7 +852,7 @@ IceDelegateM::Ice::Object::ice_invoke(const string& operation,
 				      vector<Byte>& outParams,
 				      const Context& context)
 {
-    Outgoing __out(__connection, __reference, operation, mode, context);
+    Outgoing __out(__connection.get(), __reference.get(), operation, mode, context);
     BasicStream* __os = __out.os();
     __os->writeBlob(inParams);
     bool ok = __out.invoke();
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 3a4f99b0748..f403b819a26 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -479,7 +479,7 @@ IceInternal::ThreadPool::run()
 		// If the handler is "readable", try to read a
 		// message.
 		//
-		BasicStream stream(_instance);
+		BasicStream stream(_instance.get());
 		if(handler->readable())
 		{
 		    try
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 7deaddb0e17..af144af083f 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -1658,7 +1658,7 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
     C << sp << nl << retS << nl << "IceDelegateM" << scoped << paramsDecl;
     C << sb;
     C << nl << "static const ::std::string __operation(\"" << p->name() << "\");";
-    C << nl << "::IceInternal::Outgoing __out(__connection, __reference, __operation, "
+    C << nl << "::IceInternal::Outgoing __out(__connection.get(), __reference.get(), __operation, "
       << "static_cast< ::Ice::OperationMode>(" << p->mode() << "), __context);";
     if(ret || !outParams.empty() || !throws.empty())
     {
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index 85d33d5edf3..db303bd6e91 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -113,7 +113,7 @@ writeCodecC(const TypePtr& type, const string& name, const string& freezeType, O
     if(binary)
     {
         C << nl << "IceInternal::InstancePtr instance = IceInternal::getInstance(communicator);";
-        C << nl << "IceInternal::BasicStream stream(instance);";
+        C << nl << "IceInternal::BasicStream stream(instance.get());";
         writeMarshalUnmarshalCode(C, type, "v", true, "stream", false);
         C << nl << "bytes = stream.b;";
     }
@@ -135,7 +135,7 @@ writeCodecC(const TypePtr& type, const string& name, const string& freezeType, O
     if(binary)
     {
         C << nl << "IceInternal::InstancePtr instance = IceInternal::getInstance(communicator);";
-        C << nl << "IceInternal::BasicStream stream(instance);";
+        C << nl << "IceInternal::BasicStream stream(instance.get());";
         C << nl << "stream.b = bytes;";
         C << nl << "stream.i = stream.b.begin();";
         writeMarshalUnmarshalCode(C, type, "v", false, "stream", false);