summaryrefslogtreecommitdiff
path: root/java/src/Freeze/ObjectStore.java
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2012-10-23 16:19:38 -0400
committerBernard Normier <bernard@zeroc.com>2012-10-23 16:19:38 -0400
commitada25bad3511a359eb28cf48f018d6a42e166f10 (patch)
tree430749f887a1c6f708c2d4a23b3e3ec4ef18ef2c /java/src/Freeze/ObjectStore.java
parentRuby 1.8 fix (diff)
downloadice-ada25bad3511a359eb28cf48f018d6a42e166f10.tar.bz2
ice-ada25bad3511a359eb28cf48f018d6a42e166f10.tar.xz
ice-ada25bad3511a359eb28cf48f018d6a42e166f10.zip
Fixed ICE-4855: expand tabs to space (8) for .php, .cpp, .h, .java and .cs files
Diffstat (limited to 'java/src/Freeze/ObjectStore.java')
-rw-r--r--java/src/Freeze/ObjectStore.java70
1 files changed, 35 insertions, 35 deletions
diff --git a/java/src/Freeze/ObjectStore.java b/java/src/Freeze/ObjectStore.java
index 6ca9b493261..82ccc40ac55 100644
--- a/java/src/Freeze/ObjectStore.java
+++ b/java/src/Freeze/ObjectStore.java
@@ -22,7 +22,7 @@ class ObjectStore implements IceUtil.Store
_indices = indices;
_communicator = evictor.communicator();
_encoding = evictor.encoding();
- _keepStats = false;
+ _keepStats = false;
if(facet.equals(""))
{
@@ -56,18 +56,18 @@ class ObjectStore implements IceUtil.Store
CatalogData catalogData = catalog.get(evictor.filename());
if(catalogData != null)
- {
- if(catalogData.evictor)
- {
- _keepStats = catalogData.value.isEmpty();
- }
- else
- {
- DatabaseException ex = new DatabaseException();
- ex.message = _evictor.errorPrefix() + evictor.filename() + " is not an evictor database";
- throw ex;
- }
- }
+ {
+ if(catalogData.evictor)
+ {
+ _keepStats = catalogData.value.isEmpty();
+ }
+ else
+ {
+ DatabaseException ex = new DatabaseException();
+ ex.message = _evictor.errorPrefix() + evictor.filename() + " is not an evictor database";
+ throw ex;
+ }
+ }
com.sleepycat.db.Environment dbEnv = evictor.dbEnv().getEnv();
@@ -329,14 +329,14 @@ class ObjectStore implements IceUtil.Store
new IceInternal.BasicStream(IceInternal.Util.getInstance(communicator), encoding, true, false);
os.startWriteEncaps();
- if(keepStats)
- {
- v.__write(os);
- }
- else
- {
- os.writeObject(v.servant);
- }
+ if(keepStats)
+ {
+ v.__write(os);
+ }
+ else
+ {
+ os.writeObject(v.servant);
+ }
os.writePendingObjects();
os.endWriteEncaps();
IceInternal.Buffer buf = os.prepareWrite();
@@ -358,18 +358,18 @@ class ObjectStore implements IceUtil.Store
buf.b.position(0);
ObjectRecord rec = new ObjectRecord();
is.startReadEncaps();
- if(keepStats)
- {
- rec.__read(is);
- is.readPendingObjects();
- }
- else
- {
- Ice.ObjectHolder holder = new Ice.ObjectHolder();
- is.readObject(holder);
- is.readPendingObjects();
- rec.servant = holder.value;
- }
+ if(keepStats)
+ {
+ rec.__read(is);
+ is.readPendingObjects();
+ }
+ else
+ {
+ Ice.ObjectHolder holder = new Ice.ObjectHolder();
+ is.readObject(holder);
+ is.readPendingObjects();
+ rec.servant = holder.value;
+ }
is.endReadEncaps();
return rec;
}
@@ -401,7 +401,7 @@ class ObjectStore implements IceUtil.Store
final boolean
keepStats()
{
- return _keepStats;
+ return _keepStats;
}
final EvictorI
@@ -567,7 +567,7 @@ class ObjectStore implements IceUtil.Store
com.sleepycat.db.DatabaseEntry dbValue = new com.sleepycat.db.DatabaseEntry(marshalValue(objectRecord,
_communicator,
_encoding,
- _keepStats));
+ _keepStats));
try
{