diff options
| author | Eike Stepper | 2017-01-30 16:51:56 +0000 |
|---|---|---|
| committer | Eike Stepper | 2017-01-30 16:51:56 +0000 |
| commit | f3cc80821ac2c25c9ed892dcd194c232784b985c (patch) | |
| tree | faa404f7e98b7da37e12a82356df5f14ad4dbfa4 /plugins/org.eclipse.emf.cdo.server | |
| parent | 5299e1447b063ffd15f67613032fd7e7651594ad (diff) | |
| download | cdo-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')
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java index 35cd1dab7f..425e265b72 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java @@ -1508,8 +1508,8 @@ public class Repository extends Container<Object> implements InternalRepository, final long fromCommitTime = lastReplicatedCommitTime + 1L; final long toCommitTime = store.getLastCommitTime(); - out.writeInt(toBranchID); - out.writeLong(toCommitTime); + out.writeXInt(toBranchID); + out.writeXLong(toCommitTime); IStoreAccessor.Raw accessor = (IStoreAccessor.Raw)StoreThreadLocal.getAccessor(); accessor.rawExport(out, fromBranchID, toBranchID, fromCommitTime, toCommitTime); diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java index fd11415bce..8057dfdc5e 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java @@ -424,9 +424,9 @@ public abstract class SynchronizableRepository extends Repository.Default implem long previousCommitTime = getLastCommitTimeStamp(); int fromBranchID = lastReplicatedBranchID + 1; - int toBranchID = in.readInt(); + int toBranchID = in.readXInt(); long fromCommitTime = lastReplicatedCommitTime + 1L; - long toCommitTime = in.readLong(); + long toCommitTime = in.readXLong(); StoreThreadLocal.setSession(replicatorSession); IStoreAccessor.Raw accessor = (IStoreAccessor.Raw)StoreThreadLocal.getAccessor(); diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreAccessor.java index b21141d0e6..3363f19bc5 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreAccessor.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreAccessor.java @@ -404,7 +404,7 @@ public interface IStoreAccessor extends IQueryHandlerProvider, BranchLoader, Com * <ol> * <li> {@link ExtendedDataInputStream#readByteArray() int + byte[]}: the id of the lob (prepended by the size of the * id). - * <li> {@link ExtendedDataInputStream#readLong() long}: the size of the lob. The foollowing interpretation applies: + * <li> {@link ExtendedDataInputStream#readLong() long}: the size of the lob. The following interpretation applies: * <ul> * <li>A positive size indicates a {@link CDOBlob blob} and means the number of bytes that can be * {@link IOUtil#copyBinary(java.io.InputStream, java.io.OutputStream) read}. |