diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitNotificationIndication.java')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitNotificationIndication.java | 133 |
1 files changed, 74 insertions, 59 deletions
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitNotificationIndication.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitNotificationIndication.java index ea686e469a..555fafa3dc 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitNotificationIndication.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitNotificationIndication.java @@ -11,19 +11,35 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.net4j.protocol; -import org.eclipse.emf.cdo.common.commit.CDOCommitInfo; +import org.eclipse.emf.cdo.common.branch.CDOBranchPoint; +import org.eclipse.emf.cdo.common.id.CDOID; +import org.eclipse.emf.cdo.common.id.CDOIDAndVersion; import org.eclipse.emf.cdo.common.io.CDODataInput; +import org.eclipse.emf.cdo.common.model.CDOPackageUnit; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; +import org.eclipse.emf.cdo.internal.net4j.bundle.OM; +import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry; +import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit; + +import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.spi.cdo.InternalCDOSession; import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author Eike Stepper */ public class CommitNotificationIndication extends CDOClientIndication { + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, CommitNotificationIndication.class); + public CommitNotificationIndication(CDOClientProtocol protocol) { super(protocol, CDOProtocolConstants.SIGNAL_COMMIT_NOTIFICATION); @@ -32,65 +48,64 @@ public class CommitNotificationIndication extends CDOClientIndication @Override protected void indicating(CDODataInput in) throws IOException { - // CDOBranchPoint branchPoint = in.readCDOBranchPoint(); - // if (TRACER.isEnabled()) - // { - // TRACER.format("Read branchpoint: {0}", branchPoint); //$NON-NLS-1$ - // } - // - // CDOPackageUnit[] packageUnits = in.readCDOPackageUnits(null); - // InternalCDOPackageRegistry packageRegistry = getSession().getPackageRegistry(); - // for (int i = 0; i < packageUnits.length; i++) - // { - // packageRegistry.putPackageUnit((InternalCDOPackageUnit)packageUnits[i]); - // } - // - // int size = in.readInt(); - // if (TRACER.isEnabled()) - // { - // TRACER.format("Reading {0} dirty IDs", size); //$NON-NLS-1$ - // } - // - // InternalCDOSession session = getSession(); - // Set<CDOIDAndVersion> dirtyOIDandVersions = new HashSet<CDOIDAndVersion>(); - // for (int i = 0; i < size; i++) - // { - // CDOIDAndVersion dirtyOIDandVersion = in.readCDOIDAndVersion(); - // if (TRACER.isEnabled()) - // { - // TRACER.format("Read dirty ID: {0}", dirtyOIDandVersion); //$NON-NLS-1$ - // } - // - // dirtyOIDandVersions.add(dirtyOIDandVersion); - // } - // - // size = in.readInt(); - // if (TRACER.isEnabled()) - // { - // TRACER.format("Reading {0} Deltas", size); //$NON-NLS-1$ - // } - // - // List<CDORevisionDelta> deltas = new ArrayList<CDORevisionDelta>(); - // for (int i = 0; i < size; i++) - // { - // CDORevisionDelta revisionDelta = in.readCDORevisionDelta(); - // deltas.add(revisionDelta); - // } - // - // size = in.readInt(); - // if (TRACER.isEnabled()) - // { - // TRACER.format("Reading {0} Detach Objects", size); //$NON-NLS-1$ - // } - // - // List<CDOID> detachedObjects = new ArrayList<CDOID>(); - // for (int i = 0; i < size; i++) - // { - // detachedObjects.add(in.readCDOID()); - // } + CDOBranchPoint branchPoint = in.readCDOBranchPoint(); + if (TRACER.isEnabled()) + { + TRACER.format("Read branchpoint: {0}", branchPoint); //$NON-NLS-1$ + } + + CDOPackageUnit[] packageUnits = in.readCDOPackageUnits(null); + InternalCDOPackageRegistry packageRegistry = getSession().getPackageRegistry(); + for (int i = 0; i < packageUnits.length; i++) + { + packageRegistry.putPackageUnit((InternalCDOPackageUnit)packageUnits[i]); + } + + int size = in.readInt(); + if (TRACER.isEnabled()) + { + TRACER.format("Reading {0} dirty IDs", size); //$NON-NLS-1$ + } InternalCDOSession session = getSession(); - CDOCommitInfo commitInfo = in.readCDOCommitInfo(session.getCommitInfoManager()); - session.handleCommitNotification(commitInfo); + Set<CDOIDAndVersion> dirtyOIDandVersions = new HashSet<CDOIDAndVersion>(); + for (int i = 0; i < size; i++) + { + CDOIDAndVersion dirtyOIDandVersion = in.readCDOIDAndVersion(); + if (TRACER.isEnabled()) + { + TRACER.format("Read dirty ID: {0}", dirtyOIDandVersion); //$NON-NLS-1$ + } + + dirtyOIDandVersions.add(dirtyOIDandVersion); + } + + size = in.readInt(); + if (TRACER.isEnabled()) + { + TRACER.format("Reading {0} Deltas", size); //$NON-NLS-1$ + } + + List<CDORevisionDelta> deltas = new ArrayList<CDORevisionDelta>(); + for (int i = 0; i < size; i++) + { + CDORevisionDelta revisionDelta = in.readCDORevisionDelta(); + deltas.add(revisionDelta); + } + + size = in.readInt(); + if (TRACER.isEnabled()) + { + TRACER.format("Reading {0} Detach Objects", size); //$NON-NLS-1$ + } + + List<CDOID> detachedObjects = new ArrayList<CDOID>(); + for (int i = 0; i < size; i++) + { + detachedObjects.add(in.readCDOID()); + } + + session.handleCommitNotification(branchPoint, Arrays.asList(packageUnits), dirtyOIDandVersions, detachedObjects, + deltas, null); } } |