summaryrefslogtreecommitdiff
path: root/java/src/Freeze/ObjectStore.java
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2009-03-31 10:19:14 -0230
committerDwayne Boone <dwayne@zeroc.com>2009-03-31 10:19:14 -0230
commit523c90a00583915ccb49880ca83ecc35467ed46b (patch)
treeb748b726573389ec7c9c2ca5fe77e321caf7398e /java/src/Freeze/ObjectStore.java
parentBug 3608 - Icestorm.ice does not need to include Identity.ice (diff)
downloadice-523c90a00583915ccb49880ca83ecc35467ed46b.tar.bz2
ice-523c90a00583915ccb49880ca83ecc35467ed46b.tar.xz
ice-523c90a00583915ccb49880ca83ecc35467ed46b.zip
Bug 3045 - move getInstance() to IceInternal
Diffstat (limited to 'java/src/Freeze/ObjectStore.java')
-rw-r--r--java/src/Freeze/ObjectStore.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/java/src/Freeze/ObjectStore.java b/java/src/Freeze/ObjectStore.java
index 230863042e4..1bf9f3ee1db 100644
--- a/java/src/Freeze/ObjectStore.java
+++ b/java/src/Freeze/ObjectStore.java
@@ -311,7 +311,7 @@ class ObjectStore implements IceUtil.Store
static byte[]
marshalKey(Ice.Identity v, Ice.Communicator communicator)
{
- IceInternal.BasicStream os = new IceInternal.BasicStream(Ice.Util.getInstance(communicator));
+ IceInternal.BasicStream os = new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator));
v.__write(os);
IceInternal.Buffer buf = os.prepareWrite();
byte[] r = new byte[buf.size()];
@@ -322,7 +322,7 @@ class ObjectStore implements IceUtil.Store
static Ice.Identity
unmarshalKey(byte[] b, Ice.Communicator communicator)
{
- IceInternal.BasicStream is = new IceInternal.BasicStream(Ice.Util.getInstance(communicator));
+ IceInternal.BasicStream is = new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator));
is.resize(b.length, true);
IceInternal.Buffer buf = is.getBuffer();
buf.b.position(0);
@@ -336,7 +336,7 @@ class ObjectStore implements IceUtil.Store
static byte[]
marshalValue(ObjectRecord v, Ice.Communicator communicator)
{
- IceInternal.BasicStream os = new IceInternal.BasicStream(Ice.Util.getInstance(communicator));
+ IceInternal.BasicStream os = new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator));
os.startWriteEncaps();
v.__write(os);
os.writePendingObjects();
@@ -350,7 +350,7 @@ class ObjectStore implements IceUtil.Store
static ObjectRecord
unmarshalValue(byte[] b, Ice.Communicator communicator)
{
- IceInternal.BasicStream is = new IceInternal.BasicStream(Ice.Util.getInstance(communicator));
+ IceInternal.BasicStream is = new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator));
is.sliceObjects(false);
is.resize(b.length, true);
IceInternal.Buffer buf = is.getBuffer();