diff options
author | Eike Stepper | 2010-12-20 11:07:49 +0000 |
---|---|---|
committer | Eike Stepper | 2010-12-20 11:07:49 +0000 |
commit | 8f8dcd31143c522eda8bc7f8175860c54e505d73 (patch) | |
tree | 1ee30605d72a934ad409e819dde560311e983c08 /plugins/org.eclipse.emf.cdo.server.net4j | |
parent | ec1cc870745bd5278c3374e8bce61482d9fa285e (diff) | |
download | cdo-8f8dcd31143c522eda8bc7f8175860c54e505d73.tar.gz cdo-8f8dcd31143c522eda8bc7f8175860c54e505d73.tar.xz cdo-8f8dcd31143c522eda8bc7f8175860c54e505d73.zip |
[332888] Remove the concept of MetaIDs
https://bugs.eclipse.org/bugs/show_bug.cgi?id=332888
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.net4j')
2 files changed, 3 insertions, 24 deletions
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 40813ea2eb..77edd97d31 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 @@ -14,7 +14,6 @@ package org.eclipse.emf.cdo.server.internal.net4j.protocol; import org.eclipse.emf.cdo.common.id.CDOID; -import org.eclipse.emf.cdo.common.id.CDOIDMetaRange; import org.eclipse.emf.cdo.common.model.EMFUtil; import org.eclipse.emf.cdo.common.protocol.CDODataInput; import org.eclipse.emf.cdo.common.protocol.CDODataOutput; @@ -41,7 +40,6 @@ import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl; import java.io.IOException; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -244,7 +242,6 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori if (success) { respondingResult(out); - respondingMappingNewPackages(out); respondingMappingNewObjects(out); } } @@ -272,28 +269,15 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori out.writeLong(commitContext.getPreviousTimeStamp()); } - protected void respondingMappingNewPackages(CDODataOutput out) throws Exception - { - // Meta ID ranges - List<CDOIDMetaRange> metaRanges = commitContext.getMetaIDRanges(); - for (CDOIDMetaRange metaRange : metaRanges) - { - out.writeCDOIDMetaRange(metaRange); - } - } - protected void respondingMappingNewObjects(CDODataOutput out) throws Exception { Map<CDOID, CDOID> idMappings = commitContext.getIDMappings(); for (Entry<CDOID, CDOID> entry : idMappings.entrySet()) { CDOID oldID = entry.getKey(); - if (!oldID.isMeta()) - { - CDOID newID = entry.getValue(); - out.writeCDOID(oldID); - out.writeCDOID(newID); - } + CDOID newID = entry.getValue(); + out.writeCDOID(oldID); + out.writeCDOID(newID); } out.writeCDOID(CDOID.NULL); diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase3Indication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase3Indication.java index d0495120c7..114ee9f671 100644 --- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase3Indication.java +++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitXATransactionPhase3Indication.java @@ -38,11 +38,6 @@ public class CommitXATransactionPhase3Indication extends CommitTransactionIndica { commitContext.commit(monitor); boolean success = respondingException(out, commitContext.getRollbackMessage()); - if (success) - { - respondingMappingNewPackages(out); - } - commitContext.postCommit(success); } |