Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2017-01-30 16:51:56 +0000
committerEike Stepper2017-01-30 16:51:56 +0000
commitf3cc80821ac2c25c9ed892dcd194c232784b985c (patch)
treefaa404f7e98b7da37e12a82356df5f14ad4dbfa4 /plugins/org.eclipse.emf.cdo.server.net4j
parent5299e1447b063ffd15f67613032fd7e7651594ad (diff)
downloadcdo-f3cc80821ac2c25c9ed892dcd194c232784b985c.tar.gz
cdo-f3cc80821ac2c25c9ed892dcd194c232784b985c.tar.xz
cdo-f3cc80821ac2c25c9ed892dcd194c232784b985c.zip
[511324] Support VarInt and VarLong serialization
https://bugs.eclipse.org/bugs/show_bug.cgi?id=511324
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.net4j')
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndicationWithMonitoring.java13
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerRequest.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ChangeSubscriptionIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CloseViewIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java34
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionCancelIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase1Indication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase2Indication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase3Indication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CreateBranchIndication.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/EnableLockNotificationIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/GetRemoteSessionsIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/HandleRevisionsIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadBranchIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadBranchesIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadChangeSetsIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadChunkIndication.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadCommitDataIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadCommitInfosIndication.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadMergeDataIndication.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPermissionsIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionByVersionIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionsIndication.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadSubBranchesIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockAreaIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockObjectsIndication.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockStateIndication.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ObjectLockedIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenViewIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryCancelIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryLobsIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RefreshSessionIndication.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageIndication.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageNotificationRequest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteSessionNotificationRequest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RenameBranchIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ReplicateRepositoryIndication.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ReplicateRepositoryRawIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RepositoryTimeIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ResetTransactionIndication.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/SwitchTargetIndication.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnitIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnlockObjectsIndication.java8
46 files changed, 147 insertions, 114 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java
index 59525f5e1b..bd0eafba8f 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.cdo.common.lob.CDOLobStore;
import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.common.protocol.CDODataInput;
import org.eclipse.emf.cdo.common.protocol.CDODataOutput;
+import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.common.revision.CDOListFactory;
import org.eclipse.emf.cdo.common.revision.CDORevisionFactory;
import org.eclipse.emf.cdo.common.security.CDOPermissionProvider;
@@ -112,6 +113,12 @@ public abstract class CDOServerIndication extends IndicationWithResponse
}
@Override
+ protected boolean isXCompression()
+ {
+ return CDOProtocolConstants.X_COMPRESSION;
+ }
+
+ @Override
protected StringIO getPackageURICompressor()
{
return getProtocol().getPackageURICompressor();
@@ -179,6 +186,12 @@ public abstract class CDOServerIndication extends IndicationWithResponse
}
@Override
+ protected boolean isXCompression()
+ {
+ return CDOProtocolConstants.X_COMPRESSION;
+ }
+
+ @Override
protected StringIO getPackageURICompressor()
{
return getProtocol().getPackageURICompressor();
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndicationWithMonitoring.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndicationWithMonitoring.java
index af0029f50f..8f6a5da352 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndicationWithMonitoring.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndicationWithMonitoring.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.cdo.common.lob.CDOLobStore;
import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.common.protocol.CDODataInput;
import org.eclipse.emf.cdo.common.protocol.CDODataOutput;
+import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.common.revision.CDOListFactory;
import org.eclipse.emf.cdo.common.revision.CDORevisionFactory;
import org.eclipse.emf.cdo.internal.common.revision.CDOListImpl;
@@ -122,6 +123,12 @@ public abstract class CDOServerIndicationWithMonitoring extends IndicationWithMo
}
@Override
+ protected boolean isXCompression()
+ {
+ return CDOProtocolConstants.X_COMPRESSION;
+ }
+
+ @Override
protected StringIO getPackageURICompressor()
{
return getProtocol().getPackageURICompressor();
@@ -195,6 +202,12 @@ public abstract class CDOServerIndicationWithMonitoring extends IndicationWithMo
}
@Override
+ protected boolean isXCompression()
+ {
+ return CDOProtocolConstants.X_COMPRESSION;
+ }
+
+ @Override
protected StringIO getPackageURICompressor()
{
return getProtocol().getPackageURICompressor();
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerRequest.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerRequest.java
index 24dab5b80b..ccbbebf53c 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerRequest.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.server.internal.net4j.protocol;
import org.eclipse.emf.cdo.common.id.CDOIDProvider;
import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.common.protocol.CDODataOutput;
+import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.spi.common.protocol.CDODataOutputImpl;
import org.eclipse.emf.cdo.spi.common.revision.CDORevisionUnchunker;
import org.eclipse.emf.cdo.spi.server.InternalSession;
@@ -76,6 +77,12 @@ public abstract class CDOServerRequest extends Request
}
@Override
+ protected boolean isXCompression()
+ {
+ return CDOProtocolConstants.X_COMPRESSION;
+ }
+
+ @Override
protected StringIO getPackageURICompressor()
{
return getProtocol().getPackageURICompressor();
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ChangeSubscriptionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ChangeSubscriptionIndication.java
index 973d9441cc..234d5da53f 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ChangeSubscriptionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ChangeSubscriptionIndication.java
@@ -39,9 +39,9 @@ public class ChangeSubscriptionIndication extends CDOServerReadIndication
{
boolean subscribeMode = true;
- int viewID = in.readInt();
+ int viewID = in.readXInt();
boolean clear = in.readBoolean();
- int size = in.readInt();
+ int size = in.readXInt();
if (size <= 0)
{
subscribeMode = false;
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CloseViewIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CloseViewIndication.java
index c21994e3df..176d9032c3 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CloseViewIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CloseViewIndication.java
@@ -30,7 +30,7 @@ public class CloseViewIndication extends CDOServerReadIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- int viewID = in.readInt();
+ int viewID = in.readXInt();
IView view = getView(viewID);
if (view != null)
{
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java
index 99b9c50721..cbd2fb73e4 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java
@@ -88,7 +88,7 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori
protected void initializeCommitContext(CDODataInput in) throws Exception
{
- int viewID = in.readInt();
+ int viewID = in.readXInt();
commitContext = getTransaction(viewID).createCommitContext();
}
@@ -126,17 +126,17 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori
initializeCommitContext(in);
commitContext.preWrite();
- long lastUpdateTime = in.readLong();
- int commitNumber = in.readInt();
+ long lastUpdateTime = in.readXLong();
+ int commitNumber = in.readXInt();
String commitComment = in.readString();
CDOBranchPoint commitMergeSource = CDOBranchUtil.readBranchPointOrNull(in);
- CDOLockState[] locksOnNewObjects = new CDOLockState[in.readInt()];
- CDOID[] idsToUnlock = new CDOID[in.readInt()];
- InternalCDOPackageUnit[] newPackageUnits = new InternalCDOPackageUnit[in.readInt()];
- InternalCDORevision[] newObjects = new InternalCDORevision[in.readInt()];
- InternalCDORevisionDelta[] dirtyObjectDeltas = new InternalCDORevisionDelta[in.readInt()];
- CDOID[] detachedObjects = new CDOID[in.readInt()];
+ CDOLockState[] locksOnNewObjects = new CDOLockState[in.readXInt()];
+ CDOID[] idsToUnlock = new CDOID[in.readXInt()];
+ InternalCDOPackageUnit[] newPackageUnits = new InternalCDOPackageUnit[in.readXInt()];
+ InternalCDORevision[] newObjects = new InternalCDORevision[in.readXInt()];
+ InternalCDORevisionDelta[] dirtyObjectDeltas = new InternalCDORevisionDelta[in.readXInt()];
+ CDOID[] detachedObjects = new CDOID[in.readXInt()];
monitor
.begin(locksOnNewObjects.length + idsToUnlock.length + newPackageUnits.length + newObjects.length + dirtyObjectDeltas.length + detachedObjects.length);
@@ -265,7 +265,7 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori
if (detachedObjectVersions != null)
{
CDOBranch branch;
- int version = in.readInt();
+ int version = in.readXInt();
if (version < 0)
{
version = -version;
@@ -361,11 +361,11 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori
out.writeByte(rollbackReason);
out.writeString(rollbackMessage);
out.writeCDOBranchPoint(commitContext.getBranchPoint());
- out.writeLong(commitContext.getPreviousTimeStamp());
+ out.writeXLong(commitContext.getPreviousTimeStamp());
if (xRefs != null)
{
- out.writeInt(xRefs.size());
+ out.writeXInt(xRefs.size());
for (CDOIDReference xRef : xRefs)
{
out.writeCDOIDReference(xRef);
@@ -373,7 +373,7 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori
}
else
{
- out.writeInt(0);
+ out.writeXInt(0);
}
}
@@ -383,7 +383,7 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori
protected void respondingResult(CDODataOutput out) throws Exception
{
out.writeCDOBranchPoint(commitContext.getBranchPoint());
- out.writeLong(commitContext.getPreviousTimeStamp());
+ out.writeXLong(commitContext.getPreviousTimeStamp());
out.writeByte(commitContext.getSecurityImpact());
}
@@ -406,7 +406,7 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori
List<LockState<Object, IView>> newLockStates = commitContext.getPostCommmitLockStates();
if (newLockStates != null)
{
- out.writeInt(newLockStates.size());
+ out.writeXInt(newLockStates.size());
for (LockState<Object, IView> lockState : newLockStates)
{
CDOLockState cdoLockState = CDOLockUtil.createLockState(lockState);
@@ -415,7 +415,7 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori
}
else
{
- out.writeInt(0);
+ out.writeXInt(0);
}
}
@@ -432,7 +432,7 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori
InternalCDORevision[] newObjects = commitContext.getNewObjects();
InternalCDORevision[] dirtyObjects = commitContext.getDirtyObjects();
- out.writeInt(newObjects.length + dirtyObjects.length);
+ out.writeXInt(newObjects.length + dirtyObjects.length);
respondingNewPermissions(out, permissionManager, session, newObjects);
respondingNewPermissions(out, permissionManager, session, dirtyObjects);
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionCancelIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionCancelIndication.java
index 08605df814..d705917dbf 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionCancelIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionCancelIndication.java
@@ -61,7 +61,7 @@ public class CommitXATransactionCancelIndication extends CommitTransactionIndica
@Override
protected void initializeCommitContext(CDODataInput in) throws Exception
{
- int viewID = in.readInt();
+ int viewID = in.readXInt();
commitContext = getRepository().getCommitManager().get(getTransaction(viewID));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase1Indication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase1Indication.java
index 50ec879e19..eba235a8ab 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase1Indication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase1Indication.java
@@ -46,7 +46,7 @@ public class CommitXATransactionPhase1Indication extends CommitTransactionIndica
@Override
protected void initializeCommitContext(CDODataInput in) throws Exception
{
- int viewID = in.readInt();
+ int viewID = in.readXInt();
InternalTransaction transaction = getTransaction(viewID);
commitContext = new XATransactionCommitContext(transaction);
}
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase2Indication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase2Indication.java
index b477be0216..6eaa8167c7 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase2Indication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase2Indication.java
@@ -44,7 +44,7 @@ public class CommitXATransactionPhase2Indication extends CommitTransactionIndica
initializeCommitContext(in);
XATransactionCommitContext xaContextContext = (XATransactionCommitContext)commitContext;
- int size = in.readInt();
+ int size = in.readXInt();
if (PROTOCOL.isEnabled())
{
PROTOCOL.format("Receiving {0} mapping informations", size); //$NON-NLS-1$
@@ -91,7 +91,7 @@ public class CommitXATransactionPhase2Indication extends CommitTransactionIndica
@Override
protected void initializeCommitContext(CDODataInput in) throws Exception
{
- int viewID = in.readInt();
+ int viewID = in.readXInt();
commitContext = getRepository().getCommitManager().get(getTransaction(viewID));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase3Indication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase3Indication.java
index fd473c9376..1b73ef9211 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase3Indication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase3Indication.java
@@ -44,7 +44,7 @@ public class CommitXATransactionPhase3Indication extends CommitTransactionIndica
@Override
protected void initializeCommitContext(CDODataInput in) throws Exception
{
- int viewID = in.readInt();
+ int viewID = in.readXInt();
commitContext = getRepository().getCommitManager().get(getTransaction(viewID));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CreateBranchIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CreateBranchIndication.java
index 961b211525..3fb07d09d8 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CreateBranchIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CreateBranchIndication.java
@@ -39,7 +39,7 @@ public class CreateBranchIndication extends CDOServerWriteIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- branchID = in.readInt();
+ branchID = in.readXInt();
branchInfo = new BranchInfo(in);
}
@@ -54,7 +54,7 @@ public class CreateBranchIndication extends CDOServerWriteIndication
InternalSessionManager sessionManager = getRepository().getSessionManager();
sessionManager.sendBranchNotification(session, branch, ChangeKind.CREATED);
- out.writeInt(branch.getID());
- out.writeLong(branch.getBase().getTimeStamp());
+ out.writeXInt(branch.getID());
+ out.writeXLong(branch.getBase().getTimeStamp());
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/EnableLockNotificationIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/EnableLockNotificationIndication.java
index adde6acc21..b2c5185fca 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/EnableLockNotificationIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/EnableLockNotificationIndication.java
@@ -30,7 +30,7 @@ public class EnableLockNotificationIndication extends CDOServerIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- int viewID = in.readInt();
+ int viewID = in.readXInt();
boolean enable = in.readBoolean();
InternalView view = getView(viewID);
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/GetRemoteSessionsIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/GetRemoteSessionsIndication.java
index 32c3bf7e2c..f8729bb8d3 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/GetRemoteSessionsIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/GetRemoteSessionsIndication.java
@@ -53,13 +53,13 @@ public class GetRemoteSessionsIndication extends CDOServerReadIndication
{
if (session != localSession)
{
- out.writeInt(session.getSessionID());
+ out.writeXInt(session.getSessionID());
out.writeString(session.getUserID());
out.writeBoolean(session.isSubscribed());
}
}
- out.writeInt(CDOProtocolConstants.NO_MORE_REMOTE_SESSIONS);
+ out.writeXInt(CDOProtocolConstants.NO_MORE_REMOTE_SESSIONS);
localSession.setSubscribed(subscribe);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/HandleRevisionsIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/HandleRevisionsIndication.java
index f28be3a098..baef3281d2 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/HandleRevisionsIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/HandleRevisionsIndication.java
@@ -74,7 +74,7 @@ public class HandleRevisionsIndication extends CDOServerReadIndication
}
}
- timeStamp = in.readLong();
+ timeStamp = in.readXLong();
if (TRACER.isEnabled())
{
TRACER.format("Read timeStamp: {0}", CDOCommonUtil.formatTimeStamp(timeStamp)); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadBranchIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadBranchIndication.java
index fb70484ad4..e73c405e14 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadBranchIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadBranchIndication.java
@@ -34,7 +34,7 @@ public class LoadBranchIndication extends CDOServerReadIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- branchID = in.readInt();
+ branchID = in.readXInt();
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadBranchesIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadBranchesIndication.java
index 5c4e86734b..1fcd7c3ceb 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadBranchesIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadBranchesIndication.java
@@ -38,8 +38,8 @@ public class LoadBranchesIndication extends CDOServerReadIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- startID = in.readInt();
- endID = in.readInt();
+ startID = in.readXInt();
+ endID = in.readXInt();
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadChangeSetsIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadChangeSetsIndication.java
index 4cf6a44287..fab2072936 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadChangeSetsIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadChangeSetsIndication.java
@@ -36,7 +36,7 @@ public class LoadChangeSetsIndication extends CDOServerReadIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- int size = in.readInt();
+ int size = in.readXInt();
ranges = new CDOBranchPointRange[size];
for (int i = 0; i < ranges.length; i++)
{
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadChunkIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadChunkIndication.java
index b77ce48c12..793b9c8477 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadChunkIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadChunkIndication.java
@@ -69,20 +69,20 @@ public class LoadChunkIndication extends CDOServerReadIndication
}
EClass eClass = (EClass)in.readCDOClassifierRefAndResolve();
- int featureID = in.readInt();
+ int featureID = in.readXInt();
feature = eClass.getEStructuralFeature(featureID);
if (TRACER.isEnabled())
{
TRACER.format("Read feature: {0}", feature); //$NON-NLS-1$
}
- fromIndex = in.readInt();
+ fromIndex = in.readXInt();
if (TRACER.isEnabled())
{
TRACER.format("Read fromIndex: {0}", fromIndex); //$NON-NLS-1$
}
- toIndex = in.readInt();
+ toIndex = in.readXInt();
if (TRACER.isEnabled())
{
TRACER.format("Read toIndex: {0}", toIndex); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadCommitDataIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadCommitDataIndication.java
index 254d23a7ab..4adbf3a449 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadCommitDataIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadCommitDataIndication.java
@@ -33,7 +33,7 @@ public class LoadCommitDataIndication extends CDOServerReadIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- timeStamp = in.readLong();
+ timeStamp = in.readXLong();
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadCommitInfosIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadCommitInfosIndication.java
index a92494ac56..d60516911a 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadCommitInfosIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadCommitInfosIndication.java
@@ -43,8 +43,8 @@ public class LoadCommitInfosIndication extends CDOServerReadIndication
protected void indicating(CDODataInput in) throws IOException
{
branch = in.readBoolean() ? in.readCDOBranch() : null;
- startTime = in.readLong();
- endTime = in.readLong();
+ startTime = in.readXLong();
+ endTime = in.readXLong();
}
@Override
@@ -60,13 +60,13 @@ public class LoadCommitInfosIndication extends CDOServerReadIndication
try
{
out.writeBoolean(true);
- out.writeLong(commitInfo.getPreviousTimeStamp());
+ out.writeXLong(commitInfo.getPreviousTimeStamp());
if (branch == null)
{
out.writeCDOBranch(commitInfo.getBranch());
}
- out.writeLong(commitInfo.getTimeStamp());
+ out.writeXLong(commitInfo.getTimeStamp());
out.writeString(commitInfo.getUserID());
out.writeString(commitInfo.getComment());
CDOBranchUtil.writeBranchPointOrNull(out, commitInfo.getMergeSource());
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadMergeDataIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadMergeDataIndication.java
index ca6b60236e..8880f4a401 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadMergeDataIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadMergeDataIndication.java
@@ -63,7 +63,7 @@ public class LoadMergeDataIndication extends CDOServerReadIndicationWithMonitori
@Override
protected void indicating(CDODataInput in, OMMonitor monitor) throws Exception
{
- infos = in.readInt();
+ infos = in.readXInt();
monitor.begin(infos);
try
@@ -94,7 +94,7 @@ public class LoadMergeDataIndication extends CDOServerReadIndicationWithMonitori
CDOBranchPoint branchPoint = in.readCDOBranchPoint();
CDORevisionAvailabilityInfo info = new CDORevisionAvailabilityInfo(branchPoint);
- int size = in.readInt();
+ int size = in.readXInt();
monitor.begin(size);
try
@@ -215,7 +215,7 @@ public class LoadMergeDataIndication extends CDOServerReadIndicationWithMonitori
}
int size = revisions.size();
- out.writeInt(size);
+ out.writeXInt(size);
monitor.begin(size);
try
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPermissionsIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPermissionsIndication.java
index 8ef6881adc..a8ed16b277 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPermissionsIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPermissionsIndication.java
@@ -44,7 +44,7 @@ public class LoadPermissionsIndication extends CDOServerReadIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- int length = in.readInt();
+ int length = in.readXInt();
ids = new CDOID[length];
oldPermissions = new CDOPermission[length];
@@ -54,7 +54,7 @@ public class LoadPermissionsIndication extends CDOServerReadIndication
oldPermissions[i] = CDOPermission.get(in.readByte());
}
- referenceChunk = in.readInt();
+ referenceChunk = in.readXInt();
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionByVersionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionByVersionIndication.java
index 48617410e1..4fa1446421 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionByVersionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionByVersionIndication.java
@@ -57,7 +57,7 @@ public class LoadRevisionByVersionIndication extends CDOServerReadIndication
TRACER.format("Read branchVersion: {0}", branchVersion); //$NON-NLS-1$
}
- referenceChunk = in.readInt();
+ referenceChunk = in.readXInt();
if (TRACER.isEnabled())
{
TRACER.format("Read referenceChunk: {0}", referenceChunk); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionsIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionsIndication.java
index 41dd5befc8..89f3f45d37 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionsIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionsIndication.java
@@ -76,17 +76,17 @@ public class LoadRevisionsIndication extends CDOServerReadIndication
TRACER.format("Read branchPoint: {0}", branchPoint); //$NON-NLS-1$
}
- referenceChunk = in.readInt();
+ referenceChunk = in.readXInt();
if (TRACER.isEnabled())
{
TRACER.format("Read referenceChunk: {0}", referenceChunk); //$NON-NLS-1$
}
- int size = in.readInt();
+ int size = in.readXInt();
if (size < 0)
{
size = -size;
- prefetchDepth = in.readInt();
+ prefetchDepth = in.readXInt();
if (TRACER.isEnabled())
{
TRACER.format("Read prefetchDepth: {0}", prefetchDepth); //$NON-NLS-1$
@@ -110,10 +110,10 @@ public class LoadRevisionsIndication extends CDOServerReadIndication
infos[i] = info;
}
- int fetchSize = in.readInt();
+ int fetchSize = in.readXInt();
if (fetchSize > 0)
{
- loadRevisionCollectionChunkSize = in.readInt();
+ loadRevisionCollectionChunkSize = in.readXInt();
if (loadRevisionCollectionChunkSize < 1)
{
loadRevisionCollectionChunkSize = 1;
@@ -197,7 +197,7 @@ public class LoadRevisionsIndication extends CDOServerReadIndication
TRACER.format("Writing {0} additional revision infos", additionalSize); //$NON-NLS-1$
}
- out.writeInt(additionalSize);
+ out.writeXInt(additionalSize);
for (int i = 0; i < additionalSize; i++)
{
InternalCDORevision revision = (InternalCDORevision)additionalRevisions.get(i);
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadSubBranchesIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadSubBranchesIndication.java
index 27533544ed..ebe29f88a4 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadSubBranchesIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadSubBranchesIndication.java
@@ -34,7 +34,7 @@ public class LoadSubBranchesIndication extends CDOServerReadIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- branchID = in.readInt();
+ branchID = in.readXInt();
}
@Override
@@ -43,7 +43,7 @@ public class LoadSubBranchesIndication extends CDOServerReadIndication
InternalCDOBranchManager branchManager = getRepository().getBranchManager();
InternalCDOBranch branch = branchManager.getBranch(branchID);
InternalCDOBranch[] branches = branch.getBranches();
- out.writeInt(branches.length);
+ out.writeXInt(branches.length);
for (InternalCDOBranch subBranch : branches)
{
SubBranchInfo info = new SubBranchInfo(subBranch.getID(), subBranch.getName(), subBranch.getBase().getTimeStamp());
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockAreaIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockAreaIndication.java
index 3e6dbb25cf..df8a9e36c4 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockAreaIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockAreaIndication.java
@@ -36,7 +36,7 @@ public class LockAreaIndication extends CDOServerWriteIndication
{
InternalLockManager lockManager = getRepository().getLockingManager();
- int viewID = in.readInt();
+ int viewID = in.readXInt();
InternalView view = getView(viewID);
boolean create = in.readBoolean();
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockObjectsIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockObjectsIndication.java
index 6af7b899d6..8d7878ca62 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockObjectsIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockObjectsIndication.java
@@ -49,12 +49,12 @@ public class LockObjectsIndication extends CDOServerWriteIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- int viewID = in.readInt();
+ int viewID = in.readXInt();
LockType lockType = in.readCDOLockType();
boolean recursive = in.readBoolean();
- long timeout = in.readLong();
+ long timeout = in.readXLong();
- int nRevisions = in.readInt();
+ int nRevisions = in.readXInt();
List<CDORevisionKey> revisionKeys = new LinkedList<CDORevisionKey>();
for (int i = 0; i < nRevisions; i++)
{
@@ -72,19 +72,19 @@ public class LockObjectsIndication extends CDOServerWriteIndication
out.writeBoolean(result.isSuccessful());
out.writeBoolean(result.isTimedOut());
out.writeBoolean(result.isWaitForUpdate());
- out.writeLong(result.getRequiredTimestamp());
+ out.writeXLong(result.getRequiredTimestamp());
CDORevisionKey[] staleRevisions = result.getStaleRevisions();
- out.writeInt(staleRevisions.length);
+ out.writeXInt(staleRevisions.length);
for (CDORevisionKey revKey : staleRevisions)
{
out.writeCDORevisionKey(revKey);
}
- out.writeLong(result.getTimestamp());
+ out.writeXLong(result.getTimestamp());
CDOLockState[] newLockStates = result.getNewLockStates();
- out.writeInt(newLockStates.length);
+ out.writeXInt(newLockStates.length);
for (CDOLockState lockState : newLockStates)
{
out.writeCDOLockState(lockState);
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockStateIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockStateIndication.java
index 76528872cf..4091b1051c 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockStateIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockStateIndication.java
@@ -49,7 +49,7 @@ public class LockStateIndication extends CDOServerReadIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- int viewID = in.readInt();
+ int viewID = in.readXInt();
InternalView view = getView(viewID);
if (view == null)
{
@@ -59,11 +59,11 @@ public class LockStateIndication extends CDOServerReadIndication
InternalLockManager lockManager = getRepository().getLockingManager();
existingLockStates = new ArrayList<CDOLockState>();
- int n = in.readInt();
+ int n = in.readXInt();
if (n < 0)
{
n = -n;
- prefetchDepth = in.readInt();
+ prefetchDepth = in.readXInt();
}
if (n == 0)
@@ -150,7 +150,7 @@ public class LockStateIndication extends CDOServerReadIndication
@Override
protected void responding(CDODataOutput out) throws IOException
{
- out.writeInt(existingLockStates.size());
+ out.writeXInt(existingLockStates.size());
for (CDOLockState lockState : existingLockStates)
{
out.writeCDOLockState(lockState);
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ObjectLockedIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ObjectLockedIndication.java
index 9e78484470..e4c6bd1627 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ObjectLockedIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ObjectLockedIndication.java
@@ -38,7 +38,7 @@ public class ObjectLockedIndication extends CDOServerReadIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- int viewID = in.readInt();
+ int viewID = in.readXInt();
IView view = getView(viewID);
InternalLockManager lockManager = getRepository().getLockingManager();
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java
index 6d55797ef2..2715c4cfed 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenSessionIndication.java
@@ -142,7 +142,7 @@ public class OpenSessionIndication extends CDOServerIndicationWithMonitoring
catch (NotAuthenticatedException ex)
{
// Skip response because the user has canceled the authentication
- out.writeInt(0);
+ out.writeXInt(0);
flush();
protocol.getExecutorService().submit(new Runnable()
@@ -172,7 +172,7 @@ public class OpenSessionIndication extends CDOServerIndicationWithMonitoring
TRACER.format("Writing sessionID: {0}", session.getSessionID()); //$NON-NLS-1$
}
- out.writeInt(session.getSessionID());
+ out.writeXInt(session.getSessionID());
if (TRACER.isEnabled())
{
TRACER.format("Writing userID: {0}", session.getUserID()); //$NON-NLS-1$
@@ -192,14 +192,14 @@ public class OpenSessionIndication extends CDOServerIndicationWithMonitoring
Set<CDOID.ObjectType> objectIDTypes = repository.getObjectIDTypes();
int types = objectIDTypes.size();
- out.writeInt(types);
+ out.writeXInt(types);
for (CDOID.ObjectType objectIDType : objectIDTypes)
{
out.writeEnum(objectIDType);
}
- out.writeLong(repository.getCreationTime());
- out.writeLong(session.getFirstUpdateTime());
+ out.writeXLong(repository.getCreationTime());
+ out.writeXLong(session.getFirstUpdateTime());
out.writeCDOID(repository.getRootResourceID());
out.writeBoolean(repository.isAuthenticating());
out.writeBoolean(repository.isSupportingAudits());
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenViewIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenViewIndication.java
index f689bd565d..c3a5204da8 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenViewIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/OpenViewIndication.java
@@ -40,7 +40,7 @@ public class OpenViewIndication extends CDOServerReadIndication
{
InternalSession session = getSession();
- int viewID = in.readInt();
+ int viewID = in.readXInt();
boolean readOnly = in.readBoolean();
if (in.readBoolean())
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryCancelIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryCancelIndication.java
index f967f8ac2e..c4be210a88 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryCancelIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryCancelIndication.java
@@ -37,7 +37,7 @@ public class QueryCancelIndication extends CDOServerReadIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- queryID = in.readInt();
+ queryID = in.readXInt();
if (TRACER.isEnabled())
{
TRACER.trace("Query " + queryID + " will be cancelled"); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryIndication.java
index eb703372a1..b54ddd7035 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryIndication.java
@@ -47,7 +47,7 @@ public class QueryIndication extends CDOServerReadIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- int viewID = in.readInt();
+ int viewID = in.readXInt();
InternalView view = getView(viewID);
CDOQueryInfo queryInfo = new CDOQueryInfoImpl(in);
@@ -64,7 +64,7 @@ public class QueryIndication extends CDOServerReadIndication
protected void responding(CDODataOutput out) throws IOException
{
// Return queryID immediately.
- out.writeInt(queryResult.getQueryID());
+ out.writeXInt(queryResult.getQueryID());
flushUnlessDisabled();
int numberOfResults = 0;
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryLobsIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryLobsIndication.java
index 4eb5929220..fce022e2b0 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryLobsIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/QueryLobsIndication.java
@@ -33,7 +33,7 @@ public class QueryLobsIndication extends CDOServerReadIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- int size = in.readInt();
+ int size = in.readXInt();
for (int i = 0; i < size; i++)
{
ids.add(in.readByteArray());
@@ -44,7 +44,7 @@ public class QueryLobsIndication extends CDOServerReadIndication
protected void responding(CDODataOutput out) throws IOException
{
getRepository().queryLobs(ids);
- out.writeInt(ids.size());
+ out.writeXInt(ids.size());
for (byte[] id : ids)
{
out.writeByteArray(id);
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RefreshSessionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RefreshSessionIndication.java
index 63611d6eac..51bfda8656 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RefreshSessionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RefreshSessionIndication.java
@@ -64,17 +64,17 @@ public class RefreshSessionIndication extends CDOServerReadIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- lastUpdateTime = in.readLong();
- initialChunkSize = in.readInt();
+ lastUpdateTime = in.readXLong();
+ initialChunkSize = in.readXInt();
enablePassiveUpdates = in.readBoolean();
- int branches = in.readInt();
+ int branches = in.readXInt();
for (int i = 0; i < branches; i++)
{
CDOBranch branch = in.readCDOBranch();
List<CDORevisionKey> revisions = new ArrayList<CDORevisionKey>();
viewedRevisions.put(branch, revisions);
- int size = in.readInt();
+ int size = in.readXInt();
for (int j = 0; j < size; j++)
{
CDORevisionKey revision = in.readCDORevisionKey();
@@ -87,7 +87,7 @@ public class RefreshSessionIndication extends CDOServerReadIndication
protected void responding(CDODataOutput out) throws IOException
{
long lastCommitTimeStamp = getRepository().getLastCommitTimeStamp();
- out.writeLong(lastCommitTimeStamp);
+ out.writeXLong(lastCommitTimeStamp);
writePackageUnits(out, lastCommitTimeStamp);
writeRevisions(out);
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageIndication.java
index 5907771ee6..8e81a23fb4 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageIndication.java
@@ -45,7 +45,7 @@ public class RemoteMessageIndication extends CDOServerReadIndication
TRACER.trace("Read message: " + message); //$NON-NLS-1$
}
- int count = in.readInt();
+ int count = in.readXInt();
if (TRACER.isEnabled())
{
TRACER.format("Reading {0} recipients", count); //$NON-NLS-1$
@@ -54,7 +54,7 @@ public class RemoteMessageIndication extends CDOServerReadIndication
int[] recipients = new int[count];
for (int i = 0; i < recipients.length; i++)
{
- recipients[i] = in.readInt();
+ recipients[i] = in.readXInt();
}
InternalSessionManager sessionManager = getRepository().getSessionManager();
@@ -64,10 +64,10 @@ public class RemoteMessageIndication extends CDOServerReadIndication
@Override
protected void responding(CDODataOutput out) throws IOException
{
- out.writeInt(result.size());
+ out.writeXInt(result.size());
for (Integer recipient : result)
{
- out.writeInt(recipient);
+ out.writeXInt(recipient);
}
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageNotificationRequest.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageNotificationRequest.java
index b04bb0dcc3..2a29c7ce16 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageNotificationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteMessageNotificationRequest.java
@@ -48,7 +48,7 @@ public class RemoteMessageNotificationRequest extends CDOServerRequest
TRACER.trace("Writing senderID: " + senderID); //$NON-NLS-1$
}
- out.writeInt(senderID);
+ out.writeXInt(senderID);
if (TRACER.isEnabled())
{
TRACER.trace("Writing message: " + message); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteSessionNotificationRequest.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteSessionNotificationRequest.java
index 86e5e457ce..6047cf4951 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteSessionNotificationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RemoteSessionNotificationRequest.java
@@ -37,7 +37,7 @@ public class RemoteSessionNotificationRequest extends CDOServerRequest
@Override
protected void requesting(CDODataOutput out) throws IOException
{
- out.writeInt(sender.getSessionID());
+ out.writeXInt(sender.getSessionID());
out.writeByte(opcode);
if (opcode == CDOProtocolConstants.REMOTE_SESSION_OPENED)
{
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RenameBranchIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RenameBranchIndication.java
index e114efe078..1b98313ffe 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RenameBranchIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RenameBranchIndication.java
@@ -42,7 +42,7 @@ public class RenameBranchIndication extends CDOServerWriteIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- branchID = in.readInt();
+ branchID = in.readXInt();
oldName = in.readString();
newName = in.readString();
}
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ReplicateRepositoryIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ReplicateRepositoryIndication.java
index a6d8f2333a..bf694bc6e3 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ReplicateRepositoryIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ReplicateRepositoryIndication.java
@@ -43,9 +43,9 @@ public class ReplicateRepositoryIndication extends CDOServerReadIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- lastReplicatedBranchID = in.readInt();
- lastReplicatedCommitTime = in.readLong();
- lockAreaIDs = new String[in.readInt()];
+ lastReplicatedBranchID = in.readXInt();
+ lastReplicatedCommitTime = in.readXLong();
+ lockAreaIDs = new String[in.readXInt()];
for (int i = 0; i < lockAreaIDs.length; i++)
{
lockAreaIDs[i] = in.readString();
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ReplicateRepositoryRawIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ReplicateRepositoryRawIndication.java
index 144200c53b..9016c7553b 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ReplicateRepositoryRawIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ReplicateRepositoryRawIndication.java
@@ -47,8 +47,8 @@ public class ReplicateRepositoryRawIndication extends CDOServerReadIndicationWit
{
monitor.begin();
- lastReplicatedBranchID = in.readInt();
- lastReplicatedCommitTime = in.readLong();
+ lastReplicatedBranchID = in.readXInt();
+ lastReplicatedCommitTime = in.readXLong();
}
finally
{
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RepositoryTimeIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RepositoryTimeIndication.java
index dc558df359..c36f6c2c7b 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RepositoryTimeIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/RepositoryTimeIndication.java
@@ -54,12 +54,12 @@ public class RepositoryTimeIndication extends CDOServerIndication
TRACER.format("Writing indicated: {0}", CDOCommonUtil.formatTimeStamp(indicated)); //$NON-NLS-1$
}
- out.writeLong(indicated);
+ out.writeXLong(indicated);
if (TRACER.isEnabled())
{
TRACER.format("Writing responded: {0}", CDOCommonUtil.formatTimeStamp(responded)); //$NON-NLS-1$
}
- out.writeLong(responded);
+ out.writeXLong(responded);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ResetTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ResetTransactionIndication.java
index c9a7fc133a..7c0db88733 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ResetTransactionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ResetTransactionIndication.java
@@ -40,13 +40,13 @@ public class ResetTransactionIndication extends CDOServerReadIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- transactionID = in.readInt();
+ transactionID = in.readXInt();
if (TRACER.isEnabled())
{
TRACER.format("Read transactionID: {0}", transactionID); //$NON-NLS-1$
}
- commitNumber = in.readInt();
+ commitNumber = in.readXInt();
if (TRACER.isEnabled())
{
TRACER.format("Read commitNumber: {0}", commitNumber); //$NON-NLS-1$
@@ -61,8 +61,8 @@ public class ResetTransactionIndication extends CDOServerReadIndication
if (lastCommitSuccess != null && lastCommitSuccess.getCommitNumber() == commitNumber)
{
out.writeBoolean(true);
- out.writeLong(lastCommitSuccess.getTimeStamp());
- out.writeLong(lastCommitSuccess.getPreviousTimeStamp());
+ out.writeXLong(lastCommitSuccess.getTimeStamp());
+ out.writeXLong(lastCommitSuccess.getPreviousTimeStamp());
}
else
{
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/SwitchTargetIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/SwitchTargetIndication.java
index 9d359154a7..6396ff4ec2 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/SwitchTargetIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/SwitchTargetIndication.java
@@ -55,10 +55,10 @@ public class SwitchTargetIndication extends CDOServerReadIndicationWithMonitorin
try
{
- int viewID = in.readInt();
+ int viewID = in.readXInt();
CDOBranchPoint branchPoint = in.readCDOBranchPoint();
- int size = in.readInt();
+ int size = in.readXInt();
List<CDOID> invalidObjects = new ArrayList<CDOID>(size);
for (int i = 0; i < size; i++)
{
@@ -84,13 +84,13 @@ public class SwitchTargetIndication extends CDOServerReadIndicationWithMonitorin
@Override
protected void responding(CDODataOutput out, OMMonitor monitor) throws IOException
{
- out.writeInt(allChangedObjects.size());
+ out.writeXInt(allChangedObjects.size());
for (CDORevisionDelta delta : allChangedObjects)
{
out.writeCDORevisionDelta(delta);
}
- out.writeInt(allDetachedObjects.size());
+ out.writeXInt(allDetachedObjects.size());
for (CDOID id : allDetachedObjects)
{
out.writeCDOID(id);
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnitIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnitIndication.java
index 9e09aef776..fb614d66c6 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnitIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnitIndication.java
@@ -53,7 +53,7 @@ public class UnitIndication extends CDOServerReadIndicationWithMonitoring
@Override
protected void indicating(CDODataInput in, OMMonitor monitor) throws Exception
{
- viewID = in.readInt();
+ viewID = in.readXInt();
rootID = in.readCDOID();
opcode = UnitOpcode.values()[in.readByte()];
}
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnlockObjectsIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnlockObjectsIndication.java
index 14e295c0cd..0931bd25bc 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnlockObjectsIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnlockObjectsIndication.java
@@ -48,10 +48,10 @@ public class UnlockObjectsIndication extends CDOServerWriteIndication
@Override
protected void indicating(CDODataInput in) throws IOException
{
- int viewID = in.readInt();
+ int viewID = in.readXInt();
LockType lockType = in.readCDOLockType();
boolean recursive = in.readBoolean();
- int size = in.readInt();
+ int size = in.readXInt();
InternalRepository repository = getRepository();
IView view = getView(viewID);
@@ -75,9 +75,9 @@ public class UnlockObjectsIndication extends CDOServerWriteIndication
@Override
protected void responding(CDODataOutput out) throws IOException
{
- out.writeLong(result.getTimestamp());
+ out.writeXLong(result.getTimestamp());
CDOLockState[] newLockStates = result.getNewLockStates();
- out.writeInt(newLockStates.length);
+ out.writeXInt(newLockStates.length);
for (CDOLockState state : newLockStates)
{
out.writeCDOLockState(state);

Back to the top