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 /java/src/Freeze/ObjectStore.java | |
| 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 'java/src/Freeze/ObjectStore.java')
| -rw-r--r-- | java/src/Freeze/ObjectStore.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/src/Freeze/ObjectStore.java b/java/src/Freeze/ObjectStore.java index 3424e5fad27..6f3c94781d0 100644 --- a/java/src/Freeze/ObjectStore.java +++ b/java/src/Freeze/ObjectStore.java @@ -291,7 +291,7 @@ class ObjectStore implements IceUtil.Store marshalKey(Ice.Identity v, Ice.Communicator communicator) { IceInternal.BasicStream os = - new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator), false, false); + new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator), true, false); v.__write(os); IceInternal.Buffer buf = os.prepareWrite(); byte[] r = new byte[buf.size()]; @@ -303,7 +303,7 @@ class ObjectStore implements IceUtil.Store unmarshalKey(byte[] b, Ice.Communicator communicator) { IceInternal.BasicStream is = - new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator), false, false); + new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator), true, false); is.resize(b.length, true); IceInternal.Buffer buf = is.getBuffer(); buf.b.position(0); @@ -318,7 +318,7 @@ class ObjectStore implements IceUtil.Store marshalValue(ObjectRecord v, Ice.Communicator communicator) { IceInternal.BasicStream os = - new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator), false, false); + new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator), true, false); os.startWriteEncaps(); v.__write(os); os.writePendingObjects(); @@ -333,7 +333,7 @@ class ObjectStore implements IceUtil.Store unmarshalValue(byte[] b, Ice.Communicator communicator) { IceInternal.BasicStream is = - new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator), false, false); + new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator), true, false); is.sliceObjects(false); is.resize(b.length, true); IceInternal.Buffer buf = is.getBuffer(); |