diff options
| author | Eike Stepper | 2021-11-02 06:24:55 +0000 |
|---|---|---|
| committer | Eike Stepper | 2021-11-02 06:24:55 +0000 |
| commit | ddac1397446de7b82f79fa1fc7060de00a433f48 (patch) | |
| tree | ae4433afbf3e6820d80f978cbb6510a9319d3fb9 | |
| parent | a93b808ee800e6f95e486637361065223e249efd (diff) | |
| download | cdo-ddac1397446de7b82f79fa1fc7060de00a433f48.tar.gz cdo-ddac1397446de7b82f79fa1fc7060de00a433f48.tar.xz cdo-ddac1397446de7b82f79fa1fc7060de00a433f48.zip | |
[Releng] Reduce protocol tracing
43 files changed, 13 insertions, 705 deletions
diff --git a/plugins/org.eclipse.emf.cdo.net4j/.options b/plugins/org.eclipse.emf.cdo.net4j/.options index 073914519d..196a9d028f 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/.options +++ b/plugins/org.eclipse.emf.cdo.net4j/.options @@ -1,7 +1,6 @@ # Debugging and tracing options org.eclipse.emf.cdo.net4j/debug = true -org.eclipse.emf.cdo.net4j/debug.protocol = true org.eclipse.emf.cdo.net4j/perf = false org.eclipse.emf.cdo.net4j/perf.revision = false diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/bundle/OM.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/bundle/OM.java index f827d0a837..9751a1f9ee 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/bundle/OM.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/bundle/OM.java @@ -33,8 +33,6 @@ public abstract class OM public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$ - public static final OMTracer DEBUG_PROTOCOL = DEBUG.tracer("protocol"); //$NON-NLS-1$ - public static final OMTracer PERF = BUNDLE.tracer("perf"); //$NON-NLS-1$ public static final OMTracer PERF_REVISION = PERF.tracer("revision"); //$NON-NLS-1$ diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOTimeRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOTimeRequest.java index 6b51a2af74..eced16c255 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOTimeRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOTimeRequest.java @@ -12,10 +12,6 @@ package org.eclipse.emf.cdo.internal.net4j.protocol; import org.eclipse.emf.cdo.common.protocol.CDODataInput; import org.eclipse.emf.cdo.common.protocol.CDODataOutput; -import org.eclipse.emf.cdo.common.util.CDOCommonUtil; -import org.eclipse.emf.cdo.internal.net4j.bundle.OM; - -import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.spi.cdo.CDOSessionProtocol.RepositoryTimeResult; @@ -26,8 +22,6 @@ import java.io.IOException; */ public abstract class CDOTimeRequest<RESULT> extends CDOClientRequest<RESULT> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, CDOTimeRequest.class); - private RepositoryTimeResult repositoryTimeResult = new RepositoryTimeResult(); public CDOTimeRequest(CDOClientProtocol protocol, short signalID) @@ -44,33 +38,14 @@ public abstract class CDOTimeRequest<RESULT> extends CDOClientRequest<RESULT> protected void requesting(CDODataOutput out) throws IOException { repositoryTimeResult.setRequested(System.currentTimeMillis()); - if (TRACER.isEnabled()) - { - TRACER.format("Requested: {0}", CDOCommonUtil.formatTimeStamp(repositoryTimeResult.getRequested())); //$NON-NLS-1$ - } } @Override protected RESULT confirming(CDODataInput in) throws IOException { repositoryTimeResult.setConfirmed(System.currentTimeMillis()); - if (TRACER.isEnabled()) - { - TRACER.format("Confirmed: {0}", CDOCommonUtil.formatTimeStamp(repositoryTimeResult.getConfirmed())); //$NON-NLS-1$ - } - repositoryTimeResult.setIndicated(in.readXLong()); - if (TRACER.isEnabled()) - { - TRACER.format("Read indicated: {0}", CDOCommonUtil.formatTimeStamp(repositoryTimeResult.getIndicated())); //$NON-NLS-1$ - } - repositoryTimeResult.setResponded(in.readXLong()); - if (TRACER.isEnabled()) - { - TRACER.format("Read responded: {0}", CDOCommonUtil.formatTimeStamp(repositoryTimeResult.getResponded())); //$NON-NLS-1$ - } - return null; } } diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ChangeCredentialsRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ChangeCredentialsRequest.java index b30defb19e..273457ed19 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ChangeCredentialsRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ChangeCredentialsRequest.java @@ -13,11 +13,9 @@ package org.eclipse.emf.cdo.internal.net4j.protocol; 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.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.net4j.util.om.monitor.OMMonitor; -import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.net4j.util.security.CredentialsUpdateOperation; import java.io.IOException; @@ -34,8 +32,6 @@ public class ChangeCredentialsRequest extends CDOClientRequestWithMonitoring<Boo { static final ConcurrentMap<CDOSession, AtomicReference<char[]>> NEW_PASSWORD_RECEIVERS = new ConcurrentHashMap<>(); - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, ChangeCredentialsRequest.class); - private final CredentialsUpdateOperation operation; private final AtomicReference<char[]> newPasswordReceiver; @@ -66,11 +62,6 @@ public class ChangeCredentialsRequest extends CDOClientRequestWithMonitoring<Boo NEW_PASSWORD_RECEIVERS.put(getSession(), newPasswordReceiver); } - if (TRACER.isEnabled()) - { - TRACER.format("Requesting %s of user credentials", operation); //$NON-NLS-1$ - } - out.writeEnum(operation); out.writeString(userID); } diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ChangeSubscriptionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ChangeSubscriptionRequest.java index 3926405d98..36deb804fe 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ChangeSubscriptionRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ChangeSubscriptionRequest.java @@ -16,9 +16,6 @@ import org.eclipse.emf.cdo.common.id.CDOID; 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.internal.net4j.bundle.OM; - -import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; import java.util.List; @@ -28,8 +25,6 @@ import java.util.List; */ public class ChangeSubscriptionRequest extends CDOClientRequest<Boolean> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, ChangeSubscriptionRequest.class); - private int viewID; private List<CDOID> ids; @@ -54,11 +49,6 @@ public class ChangeSubscriptionRequest extends CDOClientRequest<Boolean> @Override protected void requesting(CDODataOutput out) throws IOException { - if (TRACER.isEnabled()) - { - TRACER.trace("View " + viewID + " subscribing to " + ids.size()); //$NON-NLS-1$ //$NON-NLS-2$ - } - out.writeXInt(viewID); out.writeBoolean(clear); out.writeXInt(subscribeMode ? ids.size() : -ids.size()); diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java index 98e30553f5..b9558fbf1d 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java @@ -39,7 +39,6 @@ import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.common.revision.CDORevisionKey; import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.common.security.CDOPermission; -import org.eclipse.emf.cdo.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.session.CDORepositoryInfo; import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil; @@ -50,7 +49,6 @@ import org.eclipse.net4j.util.concurrent.ConcurrencyUtil; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; import org.eclipse.net4j.util.io.IOUtil; import org.eclipse.net4j.util.om.monitor.OMMonitor; -import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.spi.cdo.CDOSessionProtocol.CommitTransactionResult; @@ -72,8 +70,6 @@ import java.util.List; */ public class CommitTransactionRequest extends CDOClientRequestWithMonitoring<CommitTransactionResult> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, CommitTransactionRequest.class); - private static long sleepMillisForTesting = 0L; private final int commitNumber; @@ -172,41 +168,21 @@ public class CommitTransactionRequest extends CDOClientRequestWithMonitoring<Com out.writeXInt(changedObjects.size()); out.writeXInt(detachedObjects.size()); - if (TRACER.isEnabled()) - { - TRACER.format("Writing {0} locks on new objects", locksOnNewObjects.size()); //$NON-NLS-1$ - } - for (CDOLockState lockState : locksOnNewObjects) { out.writeCDOLockState(lockState); } - if (TRACER.isEnabled()) - { - TRACER.format("Writing {0} unlocks on changed objects", idsToUnlock.size()); //$NON-NLS-1$ - } - for (CDOID id : idsToUnlock) { out.writeCDOID(id); } - if (TRACER.isEnabled()) - { - TRACER.format("Writing {0} new package units", newPackageUnits.size()); //$NON-NLS-1$ - } - for (CDOPackageUnit newPackageUnit : newPackageUnits) { out.writeCDOPackageUnit(newPackageUnit, true); } - if (TRACER.isEnabled()) - { - TRACER.format("Writing {0} new objects", newObjects.size()); //$NON-NLS-1$ - } - for (CDOIDAndVersion newObject : newObjects) { out.writeCDORevision((CDORevision)newObject, CDORevision.UNCHUNKED); @@ -217,11 +193,6 @@ public class CommitTransactionRequest extends CDOClientRequestWithMonitoring<Com } } - if (TRACER.isEnabled()) - { - TRACER.format("Writing {0} dirty objects", changedObjects.size()); //$NON-NLS-1$ - } - CDORepositoryInfo repositoryInfo = getSession().getRepositoryInfo(); CDOID rootResourceID = repositoryInfo.getRootResourceID(); for (CDORevisionKey changedObject : changedObjects) @@ -237,11 +208,6 @@ public class CommitTransactionRequest extends CDOClientRequestWithMonitoring<Com out.writeBoolean(clearResourcePathCache); - if (TRACER.isEnabled()) - { - TRACER.format("Writing {0} detached objects", detachedObjects.size()); //$NON-NLS-1$ - } - boolean auditing = repositoryInfo.isSupportingAudits(); boolean branching = repositoryInfo.isSupportingBranches(); boolean ensuringReferentialIntegrity = repositoryInfo.isEnsuringReferentialIntegrity(); diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java index f0301afcd4..8acd8027d4 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitXATransactionPhase2Request.java @@ -16,12 +16,10 @@ 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.internal.common.id.CDOIDTempObjectExternalImpl; -import org.eclipse.emf.cdo.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.internal.net4j.messages.Messages; import org.eclipse.emf.cdo.util.CDOURIUtil; import org.eclipse.net4j.util.om.monitor.OMMonitor; -import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.spi.cdo.CDOSessionProtocol.CommitTransactionResult; @@ -43,8 +41,6 @@ import java.util.Map.Entry; */ public class CommitXATransactionPhase2Request extends CommitXATransactionRequest { - private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, CommitXATransactionPhase1Request.class); - public CommitXATransactionPhase2Request(CDOClientProtocol protocol, InternalCDOXACommitContext xaContext) { super(protocol, CDOProtocolConstants.SIGNAL_XA_COMMIT_TRANSACTION_PHASE2, xaContext); @@ -66,10 +62,6 @@ public class CommitXATransactionPhase2Request extends CommitXATransactionRequest Map<CDOIDTempObjectExternalImpl, InternalCDOTransaction> requestedIDs = context.getRequestedIDs(); int size = requestedIDs.size(); out.writeXInt(size); - if (PROTOCOL.isEnabled()) - { - PROTOCOL.format("Number of ids requested: {0}", size); //$NON-NLS-1$ - } for (Entry<CDOIDTempObjectExternalImpl, InternalCDOTransaction> entry : requestedIDs.entrySet()) { @@ -92,11 +84,6 @@ public class CommitXATransactionPhase2Request extends CommitXATransactionRequest } CDOID newIDExternal = CDOURIUtil.convertExternalCDOID(oldURIExternal, newID); - if (PROTOCOL.isEnabled()) - { - PROTOCOL.format("ID mapping: {0} --> {1}", tempID.toURIFragment(), newIDExternal.toURIFragment()); //$NON-NLS-1$ - } - out.writeCDOID(tempID); out.writeCDOID(newIDExternal); diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/GetRemoteSessionsRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/GetRemoteSessionsRequest.java index c5a8f81672..076efa365f 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/GetRemoteSessionsRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/GetRemoteSessionsRequest.java @@ -13,11 +13,8 @@ package org.eclipse.emf.cdo.internal.net4j.protocol; 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.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.session.remote.CDORemoteSession; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import org.eclipse.emf.spi.cdo.InternalCDORemoteSessionManager; import java.io.IOException; @@ -29,8 +26,6 @@ import java.util.List; */ public class GetRemoteSessionsRequest extends CDOClientRequest<List<CDORemoteSession>> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, GetRemoteSessionsRequest.class); - private boolean subscribe; public GetRemoteSessionsRequest(CDOClientProtocol protocol, boolean subscribe) @@ -42,11 +37,6 @@ public class GetRemoteSessionsRequest extends CDOClientRequest<List<CDORemoteSes @Override protected void requesting(CDODataOutput out) throws IOException { - if (TRACER.isEnabled()) - { - TRACER.format("Writing subscribe: {0}", subscribe); //$NON-NLS-1$ - } - out.writeBoolean(subscribe); } diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/HandleRevisionsRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/HandleRevisionsRequest.java index d1b0ff5c64..a3c6e1a862 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/HandleRevisionsRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/HandleRevisionsRequest.java @@ -16,10 +16,6 @@ import org.eclipse.emf.cdo.common.protocol.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.common.revision.CDORevisionHandler; -import org.eclipse.emf.cdo.common.util.CDOCommonUtil; -import org.eclipse.emf.cdo.internal.net4j.bundle.OM; - -import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.ecore.EClass; @@ -30,8 +26,6 @@ import java.io.IOException; */ public class HandleRevisionsRequest extends CDOClientRequest<Boolean> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, HandleRevisionsRequest.class); - private EClass eClass; private CDOBranch branch; @@ -62,11 +56,6 @@ public class HandleRevisionsRequest extends CDOClientRequest<Boolean> if (eClass != null) { out.writeBoolean(true); - if (TRACER.isEnabled()) - { - TRACER.format("Writing eClass: {0}", eClass); //$NON-NLS-1$ - } - out.writeCDOClassifierRef(eClass); } else @@ -77,34 +66,15 @@ public class HandleRevisionsRequest extends CDOClientRequest<Boolean> if (branch != null) { out.writeBoolean(true); - if (TRACER.isEnabled()) - { - TRACER.format("Writing branch: {0}", branch); //$NON-NLS-1$ - } - out.writeCDOBranch(branch); - if (TRACER.isEnabled()) - { - TRACER.format("Writing exactBranch: {0}", exactBranch); //$NON-NLS-1$ - } - out.writeBoolean(exactBranch); } else { out.writeBoolean(false); } - if (TRACER.isEnabled()) - { - TRACER.format("Writing timeStamp: {0}", CDOCommonUtil.formatTimeStamp(timeStamp)); //$NON-NLS-1$ - } out.writeXLong(timeStamp); - if (TRACER.isEnabled()) - { - TRACER.format("Writing exactTime: {0}", exactTime); //$NON-NLS-1$ - } - out.writeBoolean(exactTime); } @@ -114,11 +84,6 @@ public class HandleRevisionsRequest extends CDOClientRequest<Boolean> while (in.readBoolean()) { CDORevision revision = in.readCDORevision(); - if (TRACER.isEnabled()) - { - TRACER.format("Read revision: {0}", revision); //$NON-NLS-1$ - } - handler.handleRevision(revision); } diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadChunkRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadChunkRequest.java index 629df514be..a32a93cfb1 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadChunkRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadChunkRequest.java @@ -10,19 +10,14 @@ */ package org.eclipse.emf.cdo.internal.net4j.protocol; -import org.eclipse.emf.cdo.common.branch.CDOBranch; -import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.model.CDOModelUtil; import org.eclipse.emf.cdo.common.model.CDOType; 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.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.common.revision.InternalCDOList; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import org.eclipse.emf.ecore.EStructuralFeature; import java.io.IOException; @@ -32,8 +27,6 @@ import java.io.IOException; */ public class LoadChunkRequest extends CDOClientRequest<Object> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, LoadChunkRequest.class); - private InternalCDORevision revision; private EStructuralFeature feature; @@ -61,46 +54,14 @@ public class LoadChunkRequest extends CDOClientRequest<Object> @Override protected void requesting(CDODataOutput out) throws IOException { - CDOID id = revision.getID(); - if (TRACER.isEnabled()) - { - TRACER.format("Writing revision ID: {0}", id); //$NON-NLS-1$ - } - - out.writeCDOID(id); - CDOBranch branch = revision.getBranch(); - if (TRACER.isEnabled()) - { - TRACER.format("Writing branch: {0}", branch); //$NON-NLS-1$ - } - - out.writeCDOBranch(branch); - int version = revision.getVersion(); - if (TRACER.isEnabled()) - { - TRACER.format("Writing version: {0}", version); //$NON-NLS-1$ - } - - out.writeXInt(version); - if (TRACER.isEnabled()) - { - TRACER.format("Writing feature: {0}", feature); //$NON-NLS-1$ - } - + out.writeCDOID(revision.getID()); + out.writeCDOBranch(revision.getBranch()); + out.writeXInt(revision.getVersion()); out.writeCDOClassifierRef(feature.getEContainingClass()); out.writeXInt(feature.getFeatureID()); - if (TRACER.isEnabled()) - { - TRACER.format("Writing fromIndex: {0}", fromIndex); //$NON-NLS-1$ - } int diffIndex = accessIndex - fetchIndex; out.writeXInt(fromIndex - diffIndex); - if (TRACER.isEnabled()) - { - TRACER.format("Writing toIndex: {0}", toIndex); //$NON-NLS-1$ - } - out.writeXInt(toIndex - diffIndex); } diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadObjectLifetimeRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadObjectLifetimeRequest.java index 739dc1ca7d..47dad201da 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadObjectLifetimeRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadObjectLifetimeRequest.java @@ -16,11 +16,8 @@ import org.eclipse.emf.cdo.common.id.CDOID; 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.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import java.io.IOException; import java.text.MessageFormat; @@ -29,8 +26,6 @@ import java.text.MessageFormat; */ public class LoadObjectLifetimeRequest extends CDOClientRequest<CDOBranchPointRange> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, LoadObjectLifetimeRequest.class); - private CDOID id; private CDOBranchPoint branchPoint; @@ -45,17 +40,7 @@ public class LoadObjectLifetimeRequest extends CDOClientRequest<CDOBranchPointRa @Override protected void requesting(CDODataOutput out) throws IOException { - if (TRACER.isEnabled()) - { - TRACER.format("Writing id: {0}", id); //$NON-NLS-1$ - } - out.writeCDOID(id); - if (TRACER.isEnabled()) - { - TRACER.format("Writing branchPoint: {0}", branchPoint); //$NON-NLS-1$ - } - out.writeCDOBranchPoint(branchPoint); } diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadPackagesRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadPackagesRequest.java index 32e51675aa..988e84ec75 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadPackagesRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadPackagesRequest.java @@ -15,11 +15,8 @@ import org.eclipse.emf.cdo.common.model.EMFUtil; 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.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.resource.ResourceSet; @@ -30,8 +27,6 @@ import java.io.IOException; */ public class LoadPackagesRequest extends CDOClientRequest<EPackage[]> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, LoadPackagesRequest.class); - private InternalCDOPackageUnit packageUnit; public LoadPackagesRequest(CDOClientProtocol protocol, InternalCDOPackageUnit packageUnit) @@ -43,13 +38,7 @@ public class LoadPackagesRequest extends CDOClientRequest<EPackage[]> @Override protected void requesting(CDODataOutput out) throws IOException { - String packageUnitID = packageUnit.getID(); - if (TRACER.isEnabled()) - { - TRACER.format("Writing packageUnitID: {0}", packageUnitID); //$NON-NLS-1$ - } - - out.writeCDOPackageURI(packageUnitID); + out.writeCDOPackageURI(packageUnit.getID()); } @Override diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionByVersionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionByVersionRequest.java index 50a6decd67..458a148aae 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionByVersionRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionByVersionRequest.java @@ -15,12 +15,9 @@ import org.eclipse.emf.cdo.common.id.CDOID; 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.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.cdo.spi.common.revision.RevisionInfo; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import java.io.IOException; import java.text.MessageFormat; @@ -29,8 +26,6 @@ import java.text.MessageFormat; */ public class LoadRevisionByVersionRequest extends CDOClientRequest<InternalCDORevision> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, LoadRevisionByVersionRequest.class); - private CDOID id; private CDOBranchVersion branchVersion; @@ -48,23 +43,8 @@ public class LoadRevisionByVersionRequest extends CDOClientRequest<InternalCDORe @Override protected void requesting(CDODataOutput out) throws IOException { - if (TRACER.isEnabled()) - { - TRACER.format("Writing id: {0}", id); //$NON-NLS-1$ - } - out.writeCDOID(id); - if (TRACER.isEnabled()) - { - TRACER.format("Writing branchVersion: {0}", branchVersion); //$NON-NLS-1$ - } - out.writeCDOBranchVersion(branchVersion); - if (TRACER.isEnabled()) - { - TRACER.format("Writing referenceChunk: {0}", referenceChunk); //$NON-NLS-1$ - } - out.writeXInt(referenceChunk); } diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ObjectLockedRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ObjectLockedRequest.java index a916c1a164..2ff49d5719 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ObjectLockedRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ObjectLockedRequest.java @@ -14,11 +14,9 @@ import org.eclipse.emf.cdo.CDOObject; 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.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.net4j.util.concurrent.IRWLockManager.LockType; -import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; @@ -27,8 +25,6 @@ import java.io.IOException; */ public class ObjectLockedRequest extends CDOClientRequest<Boolean> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, ObjectLockedRequest.class); - private CDOView view; private CDOObject object; @@ -49,12 +45,6 @@ public class ObjectLockedRequest extends CDOClientRequest<Boolean> @Override protected void requesting(CDODataOutput out) throws IOException { - if (TRACER.isEnabled()) - { - TRACER.format("Requesting if object {0} has of lock for object {1}", object.cdoID(), //$NON-NLS-1$ - lockType == LockType.READ ? "read" : "write"); //$NON-NLS-1$ //$NON-NLS-2$ - } - out.writeXInt(view.getViewID()); out.writeCDOLockType(lockType); out.writeCDOID(object.cdoID()); diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/OpenSessionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/OpenSessionRequest.java index 3d79358023..3c94f84c9e 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/OpenSessionRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/OpenSessionRequest.java @@ -16,10 +16,8 @@ import org.eclipse.emf.cdo.common.CDOCommonSession.Options.PassiveUpdateMode; 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.internal.net4j.bundle.OM; import org.eclipse.net4j.util.om.monitor.OMMonitor; -import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.spi.cdo.CDOSessionProtocol.OpenSessionResult; @@ -30,8 +28,6 @@ import java.io.IOException; */ public class OpenSessionRequest extends CDOClientRequestWithMonitoring<OpenSessionResult> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, OpenSessionRequest.class); - private String repositoryName; private int sessionID; @@ -62,53 +58,12 @@ public class OpenSessionRequest extends CDOClientRequestWithMonitoring<OpenSessi @Override protected void requesting(CDODataOutput out, OMMonitor monitor) throws IOException { - if (TRACER.isEnabled()) - { - TRACER.format("Writing repositoryName: {0}", repositoryName); //$NON-NLS-1$ - } - out.writeString(repositoryName); - - if (TRACER.isEnabled()) - { - TRACER.format("Writing sessionID: {0}", sessionID); //$NON-NLS-1$ - } - out.writeXInt(sessionID); - - if (TRACER.isEnabled()) - { - TRACER.format("Writing userID: {0}", userID); //$NON-NLS-1$ - } - out.writeString(userID); - - if (TRACER.isEnabled()) - { - TRACER.format("Writing passiveUpdateEnabled: {0}", passiveUpdateEnabled); //$NON-NLS-1$ - } - out.writeBoolean(passiveUpdateEnabled); - - if (TRACER.isEnabled()) - { - TRACER.format("Writing passiveUpdateMode: {0}", passiveUpdateMode); //$NON-NLS-1$ - } - out.writeEnum(passiveUpdateMode); - - if (TRACER.isEnabled()) - { - TRACER.format("Writing lockNotificationMode: {0}", lockNotificationMode); //$NON-NLS-1$ - } - out.writeEnum(lockNotificationMode); - - if (TRACER.isEnabled()) - { - TRACER.format("Writing subscribed: {0}", subscribed); //$NON-NLS-1$ - } - out.writeBoolean(subscribed); } diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryCancelRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryCancelRequest.java index 168767f627..fcebcc9690 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryCancelRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryCancelRequest.java @@ -14,9 +14,6 @@ package org.eclipse.emf.cdo.internal.net4j.protocol; 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.internal.net4j.bundle.OM; - -import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; @@ -25,8 +22,6 @@ import java.io.IOException; */ public class QueryCancelRequest extends CDOClientRequest<Boolean> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, QueryCancelRequest.class); - private int queryID; public QueryCancelRequest(CDOClientProtocol protocol, int queryID) @@ -38,11 +33,6 @@ public class QueryCancelRequest extends CDOClientRequest<Boolean> @Override protected void requesting(CDODataOutput out) throws IOException { - if (TRACER.isEnabled()) - { - TRACER.trace("Cancel query " + queryID); //$NON-NLS-1$ - } - out.writeXInt(queryID); } diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryRequest.java index 15411784f7..2fe790e346 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/QueryRequest.java @@ -18,13 +18,10 @@ import org.eclipse.emf.cdo.common.protocol.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.common.util.CDOQueryQueue; import org.eclipse.emf.cdo.internal.common.CDOQueryInfoImpl; -import org.eclipse.emf.cdo.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.emf.internal.cdo.object.CDOObjectReferenceImpl; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import org.eclipse.emf.spi.cdo.AbstractQueryIterator; import org.eclipse.emf.spi.cdo.InternalCDOView; @@ -35,8 +32,6 @@ import java.io.IOException; */ public class QueryRequest extends CDOClientRequest<Boolean> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, QueryRequest.class); - private CDOView view; private AbstractQueryIterator<?> queryResult; @@ -72,7 +67,6 @@ public class QueryRequest extends CDOClientRequest<Boolean> try { - int numberOfObjectsReceived = 0; while (in.readBoolean()) { Object element; @@ -87,12 +81,6 @@ public class QueryRequest extends CDOClientRequest<Boolean> } resultQueue.add(element); - ++numberOfObjectsReceived; - } - - if (TRACER.isEnabled()) - { - TRACER.format("Query executed [{0} elements received]", numberOfObjectsReceived); //$NON-NLS-1$ } } catch (RuntimeException ex) diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageNotificationIndication.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageNotificationIndication.java index fe72c3996b..e085773ce2 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageNotificationIndication.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageNotificationIndication.java @@ -13,11 +13,8 @@ package org.eclipse.emf.cdo.internal.net4j.protocol; import org.eclipse.emf.cdo.common.protocol.CDODataInput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.session.remote.CDORemoteSessionMessage; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import org.eclipse.emf.spi.cdo.InternalCDORemoteSessionManager; import java.io.IOException; @@ -27,8 +24,6 @@ import java.io.IOException; */ public class RemoteMessageNotificationIndication extends CDOClientIndication { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, RemoteMessageNotificationIndication.class); - public RemoteMessageNotificationIndication(CDOClientProtocol protocol) { super(protocol, CDOProtocolConstants.SIGNAL_REMOTE_MESSAGE_NOTIFICATION); @@ -38,16 +33,7 @@ public class RemoteMessageNotificationIndication extends CDOClientIndication protected void indicating(CDODataInput in) throws IOException { int senderID = in.readXInt(); - if (TRACER.isEnabled()) - { - TRACER.trace("Read senderID: " + senderID); //$NON-NLS-1$ - } - CDORemoteSessionMessage message = new CDORemoteSessionMessage(in); - if (TRACER.isEnabled()) - { - TRACER.trace("Read message: " + message); //$NON-NLS-1$ - } InternalCDORemoteSessionManager remoteSessionManager = getSession().getRemoteSessionManager(); remoteSessionManager.handleRemoteSessionMessage(senderID, message); diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageRequest.java index 675a054661..0eb2fbfdcf 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/RemoteMessageRequest.java @@ -13,12 +13,9 @@ package org.eclipse.emf.cdo.internal.net4j.protocol; 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.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.session.remote.CDORemoteSession; import org.eclipse.emf.cdo.session.remote.CDORemoteSessionMessage; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import java.io.IOException; import java.util.HashSet; import java.util.List; @@ -29,8 +26,6 @@ import java.util.Set; */ public class RemoteMessageRequest extends CDOClientRequest<Set<Integer>> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, RemoteMessageRequest.class); - private CDORemoteSessionMessage message; private List<CDORemoteSession> recipients; @@ -45,25 +40,10 @@ public class RemoteMessageRequest extends CDOClientRequest<Set<Integer>> @Override protected void requesting(CDODataOutput out) throws IOException { - if (TRACER.isEnabled()) - { - TRACER.trace("Writing message: " + message); //$NON-NLS-1$ - } - message.write(out); - if (TRACER.isEnabled()) - { - TRACER.format("Writing {0} recipients", recipients.size()); //$NON-NLS-1$ - } - out.writeXInt(recipients.size()); for (CDORemoteSession recipient : recipients) { - if (TRACER.isEnabled()) - { - TRACER.trace("Writing recipient: " + recipient); //$NON-NLS-1$ - } - out.writeXInt(recipient.getSessionID()); } } diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ResetTransactionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ResetTransactionRequest.java index 90eedfff7a..7d201672a0 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ResetTransactionRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/ResetTransactionRequest.java @@ -14,11 +14,8 @@ import org.eclipse.emf.cdo.common.commit.CDOCommitInfo; 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.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.common.commit.InternalCDOCommitInfoManager; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import java.io.IOException; /** @@ -26,8 +23,6 @@ import java.io.IOException; */ public class ResetTransactionRequest extends CDOClientRequest<CDOCommitInfo> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, ResetTransactionRequest.class); - private int transactionID; private int commitNumber; @@ -42,18 +37,7 @@ public class ResetTransactionRequest extends CDOClientRequest<CDOCommitInfo> @Override protected void requesting(CDODataOutput out) throws IOException { - if (TRACER.isEnabled()) - { - TRACER.format("Writing transactionID: {0}", transactionID); //$NON-NLS-1$ - } - out.writeXInt(transactionID); - - if (TRACER.isEnabled()) - { - TRACER.format("Writing commitNumber: {0}", commitNumber); //$NON-NLS-1$ - } - out.writeXInt(commitNumber); } diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnlockObjectsRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnlockObjectsRequest.java index c4136799ae..cc1f768db8 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnlockObjectsRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnlockObjectsRequest.java @@ -15,10 +15,8 @@ import org.eclipse.emf.cdo.common.lock.CDOLockState; 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.internal.net4j.bundle.OM; import org.eclipse.net4j.util.concurrent.IRWLockManager.LockType; -import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.spi.cdo.CDOSessionProtocol.UnlockObjectsResult; @@ -30,8 +28,6 @@ import java.util.Collection; */ public class UnlockObjectsRequest extends CDOClientRequest<UnlockObjectsResult> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, UnlockObjectsRequest.class); - private int viewID; private Collection<CDOID> objectIDs; @@ -60,31 +56,17 @@ public class UnlockObjectsRequest extends CDOClientRequest<UnlockObjectsResult> out.writeXInt(viewID); out.writeCDOLockType(lockType); out.writeBoolean(recursive); + if (objectIDs == null) { - if (TRACER.isEnabled()) - { - TRACER.format("Unlocking all objects for view {0}", viewID); //$NON-NLS-1$ - } - out.writeXInt(CDOProtocolConstants.RELEASE_ALL_LOCKS); } else { - if (TRACER.isEnabled()) - { - TRACER.format("Unlocking of type {0} requested for view {1}", lockType == LockType.READ ? "read" //$NON-NLS-1$ //$NON-NLS-2$ - : "write", viewID); //$NON-NLS-1$ - } - out.writeXInt(objectIDs.size()); + for (CDOID id : objectIDs) { - if (TRACER.isEnabled()) - { - TRACER.format("Unlocking requested for object {0}", id); //$NON-NLS-1$ - } - out.writeCDOID(id); } } @@ -96,10 +78,12 @@ public class UnlockObjectsRequest extends CDOClientRequest<UnlockObjectsResult> long timestamp = in.readXLong(); int n = in.readXInt(); CDOLockState[] newLockStates = new CDOLockState[n]; + for (int i = 0; i < n; i++) { newLockStates[i] = in.readCDOLockState(); } + return new UnlockObjectsResult(newLockStates, timestamp); } } diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnsubscribeRemoteSessionsRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnsubscribeRemoteSessionsRequest.java index eb5f2e2566..2fa5017f8e 100644 --- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnsubscribeRemoteSessionsRequest.java +++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/UnsubscribeRemoteSessionsRequest.java @@ -13,9 +13,6 @@ package org.eclipse.emf.cdo.internal.net4j.protocol; 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.internal.net4j.bundle.OM; - -import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; @@ -24,8 +21,6 @@ import java.io.IOException; */ public class UnsubscribeRemoteSessionsRequest extends CDOClientRequest<Boolean> { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, UnsubscribeRemoteSessionsRequest.class); - public UnsubscribeRemoteSessionsRequest(CDOClientProtocol protocol) { super(protocol, CDOProtocolConstants.SIGNAL_UNSUBSCRIBE_REMOTE_SESSIONS); @@ -34,10 +29,7 @@ public class UnsubscribeRemoteSessionsRequest extends CDOClientRequest<Boolean> @Override protected void requesting(CDODataOutput out) throws IOException { - if (TRACER.isEnabled()) - { - TRACER.trace("Unsubscribing"); //$NON-NLS-1$ - } + // Do nothing. } @Override diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/.options b/plugins/org.eclipse.emf.cdo.server.net4j/.options index 10378ae640..d43f495cf5 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/.options +++ b/plugins/org.eclipse.emf.cdo.server.net4j/.options @@ -1,4 +1,3 @@ # Debugging and tracing options org.eclipse.emf.cdo.server.net4j/debug = true -org.eclipse.emf.cdo.server.net4j/debug.protocol = true diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/bundle/OM.java index dcd5e0162d..4a1ee17cfc 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/bundle/OM.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/bundle/OM.java @@ -29,8 +29,6 @@ public abstract class OM public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$ - public static final OMTracer DEBUG_PROTOCOL = DEBUG.tracer("protocol"); //$NON-NLS-1$ - public static final OMLogger LOG = BUNDLE.logger(); /** diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java index 7d6d5fda3a..b73dd9c122 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerProtocol.java @@ -51,7 +51,7 @@ public class CDOServerProtocol extends SignalProtocol<InternalSession> implement { public static final long DEFAULT_NEGOTIATION_TIMEOUT = 15 * 1000; - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, CDOServerProtocol.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, CDOServerProtocol.class); private static final boolean COMPRESS_PACKAGE_URIS = OMPlatform.INSTANCE.isProperty("org.eclipse.emf.cdo.protocol.compressPackageURIs", !StringCompressor.BYPASS); diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ChangeCredentialsIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ChangeCredentialsIndication.java index 6081ddbcf9..873edb54e2 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ChangeCredentialsIndication.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ChangeCredentialsIndication.java @@ -13,12 +13,10 @@ package org.eclipse.emf.cdo.server.internal.net4j.protocol; 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.server.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.server.InternalSessionManager; import org.eclipse.net4j.util.om.monitor.OMMonitor; import org.eclipse.net4j.util.om.monitor.OMMonitor.Async; -import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.net4j.util.security.CredentialsUpdateOperation; import org.eclipse.net4j.util.security.NotAuthenticatedException; @@ -29,8 +27,6 @@ import org.eclipse.net4j.util.security.NotAuthenticatedException; */ public class ChangeCredentialsIndication extends CDOServerIndicationWithMonitoring { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, ChangeCredentialsIndication.class); - private CredentialsUpdateOperation operation; private String userID; @@ -51,11 +47,6 @@ public class ChangeCredentialsIndication extends CDOServerIndicationWithMonitori { operation = in.readEnum(CredentialsUpdateOperation.class); userID = in.readString(); - - if (TRACER.isEnabled()) - { - TRACER.format("Initiating {0} of user credentials", operation); //$NON-NLS-1$ - } } @Override @@ -81,11 +72,6 @@ public class ChangeCredentialsIndication extends CDOServerIndicationWithMonitori break; } - if (TRACER.isEnabled()) - { - TRACER.format("Credentials %s processed.", operation); //$NON-NLS-1$ - } - out.writeBoolean(true); } catch (NotAuthenticatedException ex) 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 45af86870b..d220088267 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 @@ -15,11 +15,8 @@ import org.eclipse.emf.cdo.common.id.CDOID; 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.server.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.server.InternalView; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import java.io.IOException; /** @@ -27,8 +24,6 @@ import java.io.IOException; */ public class ChangeSubscriptionIndication extends CDOServerReadIndication { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, ChangeSubscriptionIndication.class); - public ChangeSubscriptionIndication(CDOServerProtocol protocol) { super(protocol, CDOProtocolConstants.SIGNAL_CHANGE_SUBSCRIPTION); @@ -51,11 +46,6 @@ public class ChangeSubscriptionIndication extends CDOServerReadIndication InternalView view = getView(viewID); if (clear) { - if (TRACER.isEnabled()) - { - TRACER.trace("Clear subscription"); //$NON-NLS-1$ - } - view.clearChangeSubscription(); } 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 1a1e030cd8..ca8cab17d7 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 @@ -32,7 +32,6 @@ import org.eclipse.emf.cdo.common.security.CDOPermission; import org.eclipse.emf.cdo.etypes.EtypesPackage; import org.eclipse.emf.cdo.server.IPermissionManager; import org.eclipse.emf.cdo.server.IView; -import org.eclipse.emf.cdo.server.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil; import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry; import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit; @@ -46,7 +45,6 @@ import org.eclipse.emf.cdo.spi.server.InternalView; import org.eclipse.net4j.util.WrappedException; import org.eclipse.net4j.util.concurrent.RWOLockManager.LockState; import org.eclipse.net4j.util.om.monitor.OMMonitor; -import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; @@ -67,8 +65,6 @@ import java.util.Map.Entry; */ public class CommitTransactionIndication extends CDOServerIndicationWithMonitoring { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, CommitTransactionIndication.class); - protected InternalCommitContext commitContext; public CommitTransactionIndication(CDOServerProtocol protocol) @@ -108,11 +104,6 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori } catch (Exception ex) { - if (TRACER.isEnabled()) - { - TRACER.trace(ex); - } - throw WrappedException.wrap(ex); } finally @@ -144,11 +135,6 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori try { // Locks on new objects - if (TRACER.isEnabled()) - { - TRACER.format("Reading {0} locks on new objects", locksOnNewObjects.length); //$NON-NLS-1$ - } - for (int i = 0; i < locksOnNewObjects.length; i++) { locksOnNewObjects[i] = in.readCDOLockState(); @@ -156,11 +142,6 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori } // Unlocks on changed objects - if (TRACER.isEnabled()) - { - TRACER.format("Reading {0} IDs to unlock", idsToUnlock.length); //$NON-NLS-1$ - } - for (int i = 0; i < idsToUnlock.length; i++) { idsToUnlock[i] = in.readCDOID(); @@ -168,11 +149,6 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori } // New package units - if (TRACER.isEnabled()) - { - TRACER.format("Reading {0} new package units", newPackageUnits.length); //$NON-NLS-1$ - } - if (newPackageUnits.length != 0) { InternalCDOPackageRegistry packageRegistry = commitContext.getPackageRegistry(); @@ -190,11 +166,6 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori } // New objects - if (TRACER.isEnabled()) - { - TRACER.format("Reading {0} new objects", newObjects.length); //$NON-NLS-1$ - } - boolean usingEcore = false; boolean usingEtypes = false; for (int i = 0; i < newObjects.length; i++) @@ -225,11 +196,6 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori }); // Dirty objects - if (TRACER.isEnabled()) - { - TRACER.format("Reading {0} dirty object deltas", dirtyObjectDeltas.length); //$NON-NLS-1$ - } - for (int i = 0; i < dirtyObjectDeltas.length; i++) { dirtyObjectDeltas[i] = (InternalCDORevisionDelta)in.readCDORevisionDelta(); 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 65ac96aff3..32449f3a3d 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 @@ -18,11 +18,9 @@ import org.eclipse.emf.cdo.common.protocol.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.internal.server.XATransactionCommitContext; import org.eclipse.emf.cdo.internal.server.XATransactionCommitContext.CommitState; -import org.eclipse.emf.cdo.server.internal.net4j.bundle.OM; import org.eclipse.net4j.util.WrappedException; import org.eclipse.net4j.util.om.monitor.OMMonitor; -import org.eclipse.net4j.util.om.trace.ContextTracer; import java.util.concurrent.ExecutionException; @@ -31,8 +29,6 @@ import java.util.concurrent.ExecutionException; */ public class CommitXATransactionPhase2Indication extends CommitTransactionIndication { - private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, CommitXATransactionPhase2Indication.class); - public CommitXATransactionPhase2Indication(CDOServerProtocol protocol) { super(protocol, CDOProtocolConstants.SIGNAL_XA_COMMIT_TRANSACTION_PHASE2); @@ -45,11 +41,6 @@ public class CommitXATransactionPhase2Indication extends CommitTransactionIndica XATransactionCommitContext xaContextContext = (XATransactionCommitContext)commitContext; int size = in.readXInt(); - if (PROTOCOL.isEnabled()) - { - PROTOCOL.format("Receiving {0} mapping informations", size); //$NON-NLS-1$ - } - for (int i = 0; i < size; i++) { CDOIDTemp oldID = (CDOIDTemp)in.readCDOID(); 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 c8b323bca1..a9ef860b76 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 @@ -13,11 +13,8 @@ package org.eclipse.emf.cdo.server.internal.net4j.protocol; 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.server.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.server.InternalSession; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import java.io.IOException; /** @@ -25,8 +22,6 @@ import java.io.IOException; */ public class GetRemoteSessionsIndication extends CDOServerReadIndication { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, GetRemoteSessionsIndication.class); - private boolean subscribe; public GetRemoteSessionsIndication(CDOServerProtocol protocol) @@ -38,10 +33,6 @@ public class GetRemoteSessionsIndication extends CDOServerReadIndication protected void indicating(CDODataInput in) throws IOException { subscribe = in.readBoolean(); - if (TRACER.isEnabled()) - { - TRACER.format("Read subscribe: {0}", subscribe); //$NON-NLS-1$ - } } @Override 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 45ee587926..d0b0e79a50 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 @@ -16,10 +16,6 @@ import org.eclipse.emf.cdo.common.protocol.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.common.revision.CDORevisionHandler; -import org.eclipse.emf.cdo.common.util.CDOCommonUtil; -import org.eclipse.emf.cdo.server.internal.net4j.bundle.OM; - -import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.ecore.EClass; @@ -30,8 +26,6 @@ import java.io.IOException; */ public class HandleRevisionsIndication extends CDOServerReadIndication { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, HandleRevisionsIndication.class); - private EClass eClass; private CDOBranch branch; @@ -53,38 +47,16 @@ public class HandleRevisionsIndication extends CDOServerReadIndication if (in.readBoolean()) { eClass = (EClass)in.readCDOClassifierRefAndResolve(); - if (TRACER.isEnabled()) - { - TRACER.format("Read eClass: {0}", eClass); //$NON-NLS-1$ - } } if (in.readBoolean()) { branch = in.readCDOBranch(); - if (TRACER.isEnabled()) - { - TRACER.format("Read branch: {0}", branch); //$NON-NLS-1$ - } - exactBranch = in.readBoolean(); - if (TRACER.isEnabled()) - { - TRACER.format("Read exactBranch: {0}", exactBranch); //$NON-NLS-1$ - } } timeStamp = in.readXLong(); - if (TRACER.isEnabled()) - { - TRACER.format("Read timeStamp: {0}", CDOCommonUtil.formatTimeStamp(timeStamp)); //$NON-NLS-1$ - } - exactTime = in.readBoolean(); - if (TRACER.isEnabled()) - { - TRACER.format("Read exactTime: {0}", exactTime); //$NON-NLS-1$ - } } @Override 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 e1c5170eb0..234ffb2aab 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 @@ -18,13 +18,11 @@ import org.eclipse.emf.cdo.common.model.CDOType; 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.server.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager; import org.eclipse.emf.cdo.spi.server.InternalRepository; import org.eclipse.net4j.util.collection.MoveableList; -import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; @@ -36,8 +34,6 @@ import java.io.IOException; */ public class LoadChunkIndication extends CDOServerReadIndication { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, LoadChunkIndication.class); - private CDOID id; private CDOBranchVersion branchVersion; @@ -57,36 +53,14 @@ public class LoadChunkIndication extends CDOServerReadIndication protected void indicating(CDODataInput in) throws IOException { id = in.readCDOID(); - if (TRACER.isEnabled()) - { - TRACER.format("Read revision ID: {0}", id); //$NON-NLS-1$ - } - branchVersion = in.readCDOBranchVersion(); - if (TRACER.isEnabled()) - { - TRACER.format("Read branchVersion: {0}", branchVersion); //$NON-NLS-1$ - } EClass eClass = (EClass)in.readCDOClassifierRefAndResolve(); int featureID = in.readXInt(); feature = eClass.getEStructuralFeature(featureID); - if (TRACER.isEnabled()) - { - TRACER.format("Read feature: {0}", feature); //$NON-NLS-1$ - } fromIndex = in.readXInt(); - if (TRACER.isEnabled()) - { - TRACER.format("Read fromIndex: {0}", fromIndex); //$NON-NLS-1$ - } - toIndex = in.readXInt(); - if (TRACER.isEnabled()) - { - TRACER.format("Read toIndex: {0}", toIndex); //$NON-NLS-1$ - } } @Override diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadObjectLifetimeIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadObjectLifetimeIndication.java index 90f52808a8..f0498572d8 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadObjectLifetimeIndication.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadObjectLifetimeIndication.java @@ -16,12 +16,9 @@ import org.eclipse.emf.cdo.common.id.CDOID; 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.server.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import java.io.IOException; /** @@ -29,8 +26,6 @@ import java.io.IOException; */ public class LoadObjectLifetimeIndication extends CDOServerReadIndication { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, LoadObjectLifetimeIndication.class); - private CDOID id; private CDOBranchPoint branchPoint; @@ -44,16 +39,7 @@ public class LoadObjectLifetimeIndication extends CDOServerReadIndication protected void indicating(CDODataInput in) throws IOException { id = in.readCDOID(); - if (TRACER.isEnabled()) - { - TRACER.format("Read id: {0}", id); //$NON-NLS-1$ - } - branchPoint = in.readCDOBranchPoint(); - if (TRACER.isEnabled()) - { - TRACER.format("Read branchPoint: {0}", branchPoint); //$NON-NLS-1$ - } } @Override diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPackagesIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPackagesIndication.java index 221d21926f..628b4c7d6f 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPackagesIndication.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadPackagesIndication.java @@ -14,11 +14,8 @@ import org.eclipse.emf.cdo.common.model.CDOModelUtil; 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.server.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import org.eclipse.emf.ecore.EPackage; import java.io.IOException; @@ -28,8 +25,6 @@ import java.io.IOException; */ public class LoadPackagesIndication extends CDOServerReadIndication { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, LoadPackagesIndication.class); - private String packageUnitID; public LoadPackagesIndication(CDOServerProtocol protocol) @@ -41,10 +36,6 @@ public class LoadPackagesIndication extends CDOServerReadIndication protected void indicating(CDODataInput in) throws IOException { packageUnitID = in.readCDOPackageURI(); - if (TRACER.isEnabled()) - { - TRACER.format("Read packageUnitID: {0}", packageUnitID); //$NON-NLS-1$ - } } @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 cde105a05d..6b5d7c73b2 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 @@ -15,13 +15,10 @@ import org.eclipse.emf.cdo.common.id.CDOID; 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.server.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager; import org.eclipse.emf.cdo.spi.common.revision.RevisionInfo; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import java.io.IOException; /** @@ -29,8 +26,6 @@ import java.io.IOException; */ public class LoadRevisionByVersionIndication extends CDOServerReadIndication { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, LoadRevisionByVersionIndication.class); - private CDOID id; private CDOBranchVersion branchVersion; @@ -46,22 +41,8 @@ public class LoadRevisionByVersionIndication extends CDOServerReadIndication protected void indicating(CDODataInput in) throws IOException { id = in.readCDOID(); - if (TRACER.isEnabled()) - { - TRACER.format("Read id: {0}", id); //$NON-NLS-1$ - } - branchVersion = in.readCDOBranchVersion(); - if (TRACER.isEnabled()) - { - TRACER.format("Read branchVersion: {0}", branchVersion); //$NON-NLS-1$ - } - referenceChunk = in.readXInt(); - if (TRACER.isEnabled()) - { - TRACER.format("Read referenceChunk: {0}", referenceChunk); //$NON-NLS-1$ - } } @Override 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 8c5f19f865..ccfe3416ed 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 @@ -20,7 +20,6 @@ import org.eclipse.emf.cdo.common.protocol.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.server.IRepositoryProvider; import org.eclipse.emf.cdo.server.RepositoryNotFoundException; -import org.eclipse.emf.cdo.server.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.server.InternalRepository; import org.eclipse.emf.cdo.spi.server.InternalSession; import org.eclipse.emf.cdo.spi.server.InternalSessionManager; @@ -28,7 +27,6 @@ import org.eclipse.emf.cdo.spi.server.InternalSessionManager; import org.eclipse.net4j.util.concurrent.ConcurrencyUtil; import org.eclipse.net4j.util.om.monitor.OMMonitor; import org.eclipse.net4j.util.om.monitor.OMMonitor.Async; -import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.net4j.util.security.NotAuthenticatedException; import java.util.Set; @@ -38,8 +36,6 @@ import java.util.Set; */ public class OpenSessionIndication extends CDOServerIndicationWithMonitoring { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, OpenSessionIndication.class); - private String repositoryName; private int sessionID; @@ -91,47 +87,12 @@ public class OpenSessionIndication extends CDOServerIndicationWithMonitoring protected void indicating(CDODataInput in, OMMonitor monitor) throws Exception { repositoryName = in.readString(); - if (TRACER.isEnabled()) - { - TRACER.format("Read repositoryName: {0}", repositoryName); //$NON-NLS-1$ - } - sessionID = in.readXInt(); - if (TRACER.isEnabled()) - { - TRACER.format("Read sessionID: {0}", sessionID); //$NON-NLS-1$ - } - userID = in.readString(); - if (TRACER.isEnabled()) - { - TRACER.format("Read userID: {0}", userID); //$NON-NLS-1$ - } - passiveUpdateEnabled = in.readBoolean(); - if (TRACER.isEnabled()) - { - TRACER.format("Read passiveUpdateEnabled: {0}", passiveUpdateEnabled); //$NON-NLS-1$ - } - passiveUpdateMode = in.readEnum(PassiveUpdateMode.class); - if (TRACER.isEnabled()) - { - TRACER.format("Read passiveUpdateMode: {0}", passiveUpdateMode); //$NON-NLS-1$ - } - lockNotificationMode = in.readEnum(LockNotificationMode.class); - if (TRACER.isEnabled()) - { - TRACER.format("Read lockNotificationMode: {0}", lockNotificationMode); //$NON-NLS-1$ - } - subscribed = in.readBoolean(); - if (TRACER.isEnabled()) - { - TRACER.format("Read subscribed: {0}", subscribed); //$NON-NLS-1$ - } - } @Override @@ -186,23 +147,9 @@ public class OpenSessionIndication extends CDOServerIndicationWithMonitoring session.setSubscribed(subscribed); protocol.setInfraStructure(session); - if (TRACER.isEnabled()) - { - TRACER.format("Writing sessionID: {0}", session.getSessionID()); //$NON-NLS-1$ - } out.writeXInt(session.getSessionID()); - if (TRACER.isEnabled()) - { - TRACER.format("Writing userID: {0}", session.getUserID()); //$NON-NLS-1$ - } - out.writeString(session.getUserID()); - if (TRACER.isEnabled()) - { - TRACER.format("Writing repositoryUUID: {0}", repository.getUUID()); //$NON-NLS-1$ - } - out.writeString(repository.getUUID()); out.writeString(repository.getName()); out.writeEnum(repository.getType()); 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 3742119f2c..3c9b3d2945 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 @@ -14,9 +14,6 @@ package org.eclipse.emf.cdo.server.internal.net4j.protocol; 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.server.internal.net4j.bundle.OM; - -import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; @@ -25,8 +22,6 @@ import java.io.IOException; */ public class QueryCancelIndication extends CDOServerReadIndication { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, QueryCancelIndication.class); - private int queryID; public QueryCancelIndication(CDOServerProtocol protocol) @@ -38,10 +33,6 @@ public class QueryCancelIndication extends CDOServerReadIndication protected void indicating(CDODataInput in) throws IOException { queryID = in.readXInt(); - if (TRACER.isEnabled()) - { - TRACER.trace("Query " + queryID + " will be cancelled"); //$NON-NLS-1$ //$NON-NLS-2$ - } } @Override 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 32bacc8aa1..2117685139 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 @@ -17,13 +17,10 @@ import org.eclipse.emf.cdo.common.protocol.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.common.util.CDOQueryInfo; import org.eclipse.emf.cdo.internal.common.CDOQueryInfoImpl; -import org.eclipse.emf.cdo.server.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.server.InternalQueryManager; import org.eclipse.emf.cdo.spi.server.InternalQueryResult; import org.eclipse.emf.cdo.spi.server.InternalView; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import java.io.IOException; /** @@ -31,8 +28,6 @@ import java.io.IOException; */ public class QueryIndication extends CDOServerReadIndication { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, QueryIndication.class); - private boolean xrefs; private boolean disableResponseFlushing; @@ -67,7 +62,6 @@ public class QueryIndication extends CDOServerReadIndication out.writeXInt(queryResult.getQueryID()); flushUnlessDisabled(); - int numberOfResults = 0; for (;;) { Object object; @@ -103,8 +97,6 @@ public class QueryIndication extends CDOServerReadIndication } } - ++numberOfResults; - try { if (queryResult.peek() == null) @@ -118,16 +110,11 @@ public class QueryIndication extends CDOServerReadIndication } catch (Throwable ex) { - // Ignore execution exceptions from peek(); they're handle + // Ignore execution exceptions from peek(); they're handled. } } - if (TRACER.isEnabled()) - { - TRACER.trace("Query returned " + numberOfResults + " results"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Query is done successfully + // Query is done successfully. out.writeBoolean(false); } 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 c46df7358d..c623bd7b4b 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 @@ -13,12 +13,9 @@ package org.eclipse.emf.cdo.server.internal.net4j.protocol; 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.server.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.session.remote.CDORemoteSessionMessage; import org.eclipse.emf.cdo.spi.server.InternalSessionManager; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import java.io.IOException; import java.util.List; @@ -27,8 +24,6 @@ import java.util.List; */ public class RemoteMessageIndication extends CDOServerReadIndication { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, RemoteMessageIndication.class); - private List<Integer> result; public RemoteMessageIndication(CDOServerProtocol protocol) @@ -40,16 +35,7 @@ public class RemoteMessageIndication extends CDOServerReadIndication protected void indicating(CDODataInput in) throws IOException { CDORemoteSessionMessage message = new CDORemoteSessionMessage(in); - if (TRACER.isEnabled()) - { - TRACER.trace("Read message: " + message); //$NON-NLS-1$ - } - int count = in.readXInt(); - if (TRACER.isEnabled()) - { - TRACER.format("Reading {0} recipients", count); //$NON-NLS-1$ - } int[] recipients = new int[count]; for (int i = 0; i < recipients.length; i++) 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 5f194df224..82d7c60ecd 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 @@ -14,12 +14,9 @@ package org.eclipse.emf.cdo.server.internal.net4j.protocol; import org.eclipse.emf.cdo.common.protocol.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; -import org.eclipse.emf.cdo.server.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.session.remote.CDORemoteSessionMessage; import org.eclipse.emf.cdo.spi.server.InternalSession; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import java.io.IOException; /** @@ -27,8 +24,6 @@ import java.io.IOException; */ public class RemoteMessageNotificationRequest extends CDOServerRequest { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, RemoteMessageNotificationRequest.class); - private int senderID; private CDORemoteSessionMessage message; @@ -43,17 +38,7 @@ public class RemoteMessageNotificationRequest extends CDOServerRequest @Override protected void requesting(CDODataOutput out) throws IOException { - if (TRACER.isEnabled()) - { - TRACER.trace("Writing senderID: " + senderID); //$NON-NLS-1$ - } - out.writeXInt(senderID); - if (TRACER.isEnabled()) - { - TRACER.trace("Writing message: " + message); //$NON-NLS-1$ - } - message.write(out); } } 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 d6df313833..32f13c93a0 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 @@ -13,10 +13,6 @@ package org.eclipse.emf.cdo.server.internal.net4j.protocol; 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.util.CDOCommonUtil; -import org.eclipse.emf.cdo.server.internal.net4j.bundle.OM; - -import org.eclipse.net4j.util.om.trace.ContextTracer; import java.io.IOException; @@ -25,8 +21,6 @@ import java.io.IOException; */ public class RepositoryTimeIndication extends CDOServerIndication { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, RepositoryTimeIndication.class); - private long indicated; public RepositoryTimeIndication(CDOServerProtocol protocol) @@ -49,17 +43,8 @@ public class RepositoryTimeIndication extends CDOServerIndication protected void responding(CDODataOutput out) throws IOException { long responded = getRepository().getTimeStamp(); - if (TRACER.isEnabled()) - { - TRACER.format("Writing indicated: {0}", CDOCommonUtil.formatTimeStamp(indicated)); //$NON-NLS-1$ - } out.writeXLong(indicated); - if (TRACER.isEnabled()) - { - TRACER.format("Writing responded: {0}", CDOCommonUtil.formatTimeStamp(responded)); //$NON-NLS-1$ - } - 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 d103347fbd..0dc2ef6564 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 @@ -13,12 +13,9 @@ package org.eclipse.emf.cdo.server.internal.net4j.protocol; 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.server.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.server.InternalTransaction; import org.eclipse.emf.cdo.spi.server.InternalTransaction.CommitAttempt; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import java.io.IOException; /** @@ -26,8 +23,6 @@ import java.io.IOException; */ public class ResetTransactionIndication extends CDOServerReadIndication { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, ResetTransactionIndication.class); - private int transactionID; private int commitNumber; @@ -41,16 +36,7 @@ public class ResetTransactionIndication extends CDOServerReadIndication protected void indicating(CDODataInput in) throws IOException { transactionID = in.readXInt(); - if (TRACER.isEnabled()) - { - TRACER.format("Read transactionID: {0}", transactionID); //$NON-NLS-1$ - } - commitNumber = in.readXInt(); - if (TRACER.isEnabled()) - { - TRACER.format("Read commitNumber: {0}", commitNumber); //$NON-NLS-1$ - } } @Override @@ -58,6 +44,7 @@ public class ResetTransactionIndication extends CDOServerReadIndication { InternalTransaction transaction = (InternalTransaction)getView(transactionID); CommitAttempt lastCommitSuccess = transaction.getLastCommitAttempt(); + if (lastCommitSuccess != null && lastCommitSuccess.getCommitNumber() == commitNumber) { out.writeBoolean(true); diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnsubscribeRemoteSessionsIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnsubscribeRemoteSessionsIndication.java index 24e310abb3..5194577611 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnsubscribeRemoteSessionsIndication.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/UnsubscribeRemoteSessionsIndication.java @@ -13,11 +13,8 @@ package org.eclipse.emf.cdo.server.internal.net4j.protocol; 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.server.internal.net4j.bundle.OM; import org.eclipse.emf.cdo.spi.server.InternalSession; -import org.eclipse.net4j.util.om.trace.ContextTracer; - import java.io.IOException; /** @@ -25,8 +22,6 @@ import java.io.IOException; */ public class UnsubscribeRemoteSessionsIndication extends CDOServerReadIndication { - private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, UnsubscribeRemoteSessionsIndication.class); - public UnsubscribeRemoteSessionsIndication(CDOServerProtocol protocol) { super(protocol, CDOProtocolConstants.SIGNAL_UNSUBSCRIBE_REMOTE_SESSIONS); @@ -35,11 +30,6 @@ public class UnsubscribeRemoteSessionsIndication extends CDOServerReadIndication @Override protected void indicating(CDODataInput in) throws IOException { - if (TRACER.isEnabled()) - { - TRACER.trace("Unsubscribing"); //$NON-NLS-1$ - } - InternalSession localSession = getSession(); localSession.setSubscribed(false); } |