diff options
| author | Jose <jose@zeroc.com> | 2012-03-15 16:53:10 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-03-15 16:53:10 +0100 |
| commit | b2a3402c30a42b5b5344c2758166d1a3a6534f6b (patch) | |
| tree | b111a0c07d9f2eedcad1b1c59a67ec050d5667dc /cpp/src/slice2freeze/Main.cpp | |
| parent | serialVersionUID fix to use IceUtilInternal::stringToInt64 for numeric conver... (diff) | |
| download | ice-b2a3402c30a42b5b5344c2758166d1a3a6534f6b.tar.bz2 ice-b2a3402c30a42b5b5344c2758166d1a3a6534f6b.tar.xz ice-b2a3402c30a42b5b5344c2758166d1a3a6534f6b.zip | |
ICE-4745 - Freeze serialization throws Ice.MemoryLimitException
Diffstat (limited to 'cpp/src/slice2freeze/Main.cpp')
| -rw-r--r-- | cpp/src/slice2freeze/Main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp index d40d1c61cce..c53fa24f408 100644 --- a/cpp/src/slice2freeze/Main.cpp +++ b/cpp/src/slice2freeze/Main.cpp @@ -337,7 +337,7 @@ writeCodecC(const TypePtr& type, const StringList& metaData, const string& name, << "Freeze::" << freezeType << "& bytes, const ::Ice::CommunicatorPtr& communicator)"; C << sb; C << nl << "IceInternal::InstancePtr instance = IceInternal::getInstance(communicator);"; - C << nl << "IceInternal::BasicStream stream(instance.get());"; + C << nl << "IceInternal::BasicStream stream(instance.get(), true);"; if(encaps) { C << nl << "stream.startWriteEncaps();"; @@ -358,7 +358,7 @@ writeCodecC(const TypePtr& type, const StringList& metaData, const string& name, << "const Freeze::" << freezeType << "& bytes, const ::Ice::CommunicatorPtr& communicator)"; C << sb; C << nl << "IceInternal::InstancePtr instance = IceInternal::getInstance(communicator);"; - C << nl << "IceInternal::BasicStream stream(instance.get());"; + C << nl << "IceInternal::BasicStream stream(instance.get(), true);"; if(type->usesClasses()) { C << nl << "stream.sliceObjects(false);"; @@ -719,7 +719,7 @@ writeDictWithIndicesC(const string& name, const string& absolute, const Dict& di assert(!indexTypes[i].type->usesClasses()); C << nl << "IceInternal::InstancePtr __instance = IceInternal::getInstance(__communicator);"; - C << nl << "IceInternal::BasicStream __stream(__instance.get());"; + C << nl << "IceInternal::BasicStream __stream(__instance.get(), true);"; string valueS; if(dict.indices[i].caseSensitive) @@ -751,7 +751,7 @@ writeDictWithIndicesC(const string& name, const string& absolute, const Dict& di else { C << nl << "IceInternal::InstancePtr __instance = IceInternal::getInstance(__communicator);"; - C << nl << "IceInternal::BasicStream __stream(__instance.get());"; + C << nl << "IceInternal::BasicStream __stream(__instance.get(), true);"; C << nl << "__stream.b.resize(__bytes.size());"; C << nl << "::memcpy(&__stream.b[0], &__bytes[0], __bytes.size());"; @@ -1252,7 +1252,7 @@ writeIndexC(const TypePtr& type, const TypePtr& memberType, const string& member C << nl << fullName << "::" << "marshalKey(" << inputType << " __index, Freeze::Key& __bytes) const"; C << sb; C << nl << "IceInternal::InstancePtr __instance = IceInternal::getInstance(_communicator);"; - C << nl << "IceInternal::BasicStream __stream(__instance.get());"; + C << nl << "IceInternal::BasicStream __stream(__instance.get(), true);"; string valueS; if(caseSensitive) |