3 files changed, 17 insertions, 19 deletions
diff --git a/cpp/src/FreezeScript/DumpDescriptors.cpp b/cpp/src/FreezeScript/DumpDescriptors.cpp
index 4661cc5a9fb..76ff447279a 100644
--- a/cpp/src/FreezeScript/DumpDescriptors.cpp
+++ b/cpp/src/FreezeScript/DumpDescriptors.cpp
@@ -1269,12 +1269,12 @@ FreezeScript::RecordDescriptor::execute(const SymbolTablePtr& /*sym*/, ExecuteIn
             Ice::ByteSeq keyBytes;
             keyBytes.resize(dbKey.get_size());
             memcpy(&keyBytes[0], dbKey.get_data(), dbKey.get_size());
-            Ice::InputStreamPtr inKey = Ice::createInputStream(info->communicator, keyBytes, false);
+            Ice::InputStreamPtr inKey = Ice::wrapInputStream(info->communicator, keyBytes);
 
             Ice::ByteSeq valueBytes;
             valueBytes.resize(dbValue.get_size());
             memcpy(&valueBytes[0], dbValue.get_data(), dbValue.get_size());
-            Ice::InputStreamPtr inValue = Ice::createInputStream(info->communicator, valueBytes, false);
+            Ice::InputStreamPtr inValue = Ice::wrapInputStream(info->communicator, valueBytes);
             inValue->startEncapsulation();
 
             //
diff --git a/cpp/src/FreezeScript/Transformer.cpp b/cpp/src/FreezeScript/Transformer.cpp
index c10c13e37a9..56c1f433ddd 100644
--- a/cpp/src/FreezeScript/Transformer.cpp
+++ b/cpp/src/FreezeScript/Transformer.cpp
@@ -1960,8 +1960,8 @@ FreezeScript::RecordDescriptor::transformRecord(const Ice::ByteSeq& inKeyBytes,
                                                 Ice::ByteSeq& outKeyBytes,
                                                 Ice::ByteSeq& outValueBytes)
 {
-    Ice::InputStreamPtr inKey = Ice::createInputStream(_info->communicator, inKeyBytes, false);
-    Ice::InputStreamPtr inValue = Ice::createInputStream(_info->communicator, inValueBytes, false);
+    Ice::InputStreamPtr inKey = Ice::wrapInputStream(_info->communicator, inKeyBytes);
+    Ice::InputStreamPtr inValue = Ice::wrapInputStream(_info->communicator, inValueBytes);
     inValue->startEncapsulation();
 
     Ice::OutputStreamPtr outKey = Ice::createOutputStream(_info->communicator);
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index 60adb309571..bfc155630d2 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -271,53 +271,51 @@ Ice::initialize(const InitializationData& initData, Int version)
 InputStreamPtr
 Ice::createInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes)
 {
-    return createInputStream(communicator, makePair(bytes));
+    return new InputStreamI(communicator, makePair(bytes), true);
 }
 
 InputStreamPtr
 Ice::createInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes, const EncodingVersion& v)
 {
-    return createInputStream(communicator, makePair(bytes), v);
+    return new InputStreamI(communicator, makePair(bytes), v, true);
 }
 
 InputStreamPtr
-Ice::createInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes, bool copyBytes)
+Ice::wrapInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes)
 {
-    return createInputStream(communicator, makePair(bytes), copyBytes);
+    return new InputStreamI(communicator, makePair(bytes), false);
 }
 
 InputStreamPtr
-Ice::createInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes, const EncodingVersion& v,
-                       bool copyBytes)
+Ice::wrapInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes, const EncodingVersion& v)
 {
-    return createInputStream(communicator, makePair(bytes), v, copyBytes);
+    return new InputStreamI(communicator, makePair(bytes), v, false);
 }
 
 InputStreamPtr
 Ice::createInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes)
 {
-    return createInputStream(communicator, bytes, true);
+    return new InputStreamI(communicator, bytes, true);
 }
 
 InputStreamPtr
 Ice::createInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes,
                        const EncodingVersion& v)
 {
-    return createInputStream(communicator, bytes, v, true);
+    return new InputStreamI(communicator, bytes, v, true);
 }
 
 InputStreamPtr
-Ice::createInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes,
-                       bool copyBytes)
+Ice::wrapInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes)
 {
-    return new InputStreamI(communicator, bytes, copyBytes);
+    return new InputStreamI(communicator, bytes, false);
 }
 
 InputStreamPtr
-Ice::createInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes,
-                       const EncodingVersion& v, bool copyBytes)
+Ice::wrapInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes,
+                     const EncodingVersion& v)
 {
-    return new InputStreamI(communicator, bytes, v, copyBytes);
+    return new InputStreamI(communicator, bytes, v, false);
 }
 
 OutputStreamPtr