diff options
| author | Mark Spruiell <mes@zeroc.com> | 2010-05-26 17:50:23 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2010-05-26 17:50:23 -0700 |
| commit | 66c178bc1dfb4a53aa56c4b90d305f72bcc3c553 (patch) | |
| tree | b22ec2452d6f5ca61345dcafe2c92ad3cb5afef6 /java/src/Freeze/ObjectStore.java | |
| parent | Merge branch 'master' of ssh://git/home/git/ice (diff) | |
| download | ice-66c178bc1dfb4a53aa56c4b90d305f72bcc3c553.tar.bz2 ice-66c178bc1dfb4a53aa56c4b90d305f72bcc3c553.tar.xz ice-66c178bc1dfb4a53aa56c4b90d305f72bcc3c553.zip | |
bug 4515 - OutOfMemoryError in dbmap test
Diffstat (limited to 'java/src/Freeze/ObjectStore.java')
| -rw-r--r-- | java/src/Freeze/ObjectStore.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/java/src/Freeze/ObjectStore.java b/java/src/Freeze/ObjectStore.java index 8be40d468d0..b0ba17e66d7 100644 --- a/java/src/Freeze/ObjectStore.java +++ b/java/src/Freeze/ObjectStore.java @@ -304,7 +304,8 @@ class ObjectStore implements IceUtil.Store static byte[] marshalKey(Ice.Identity v, Ice.Communicator communicator) { - IceInternal.BasicStream os = new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator)); + IceInternal.BasicStream os = + new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator), false, false); v.__write(os); IceInternal.Buffer buf = os.prepareWrite(); byte[] r = new byte[buf.size()]; @@ -315,7 +316,8 @@ class ObjectStore implements IceUtil.Store static Ice.Identity unmarshalKey(byte[] b, Ice.Communicator communicator) { - IceInternal.BasicStream is = new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator)); + IceInternal.BasicStream is = + new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator), false, false); is.resize(b.length, true); IceInternal.Buffer buf = is.getBuffer(); buf.b.position(0); @@ -329,7 +331,8 @@ class ObjectStore implements IceUtil.Store static byte[] marshalValue(ObjectRecord v, Ice.Communicator communicator) { - IceInternal.BasicStream os = new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator)); + IceInternal.BasicStream os = + new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator), false, false); os.startWriteEncaps(); v.__write(os); os.writePendingObjects(); @@ -343,7 +346,8 @@ class ObjectStore implements IceUtil.Store static ObjectRecord unmarshalValue(byte[] b, Ice.Communicator communicator) { - IceInternal.BasicStream is = new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator)); + IceInternal.BasicStream is = + new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator), false, false); is.sliceObjects(false); is.resize(b.length, true); IceInternal.Buffer buf = is.getBuffer(); |