diff options
Diffstat (limited to 'plugins')
2 files changed, 4 insertions, 11 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java index 34aed6ef24..c996f978f2 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java @@ -729,7 +729,7 @@ public final class EMFUtil private boolean demandLoading; - ExtResourceSet(boolean delegating, boolean demandLoading) + public ExtResourceSet(boolean delegating, boolean demandLoading) { this.delegating = delegating; this.demandLoading = demandLoading; 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 7a185fbe13..3d101ab9fd 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 @@ -22,6 +22,7 @@ import org.eclipse.emf.cdo.common.id.CDOIDUtil; import org.eclipse.emf.cdo.common.lock.CDOLockState; import org.eclipse.emf.cdo.common.lock.CDOLockUtil; import org.eclipse.emf.cdo.common.model.EMFUtil; +import org.eclipse.emf.cdo.common.model.EMFUtil.ExtResourceSet; import org.eclipse.emf.cdo.common.protocol.CDODataInput; import org.eclipse.emf.cdo.common.protocol.CDODataOutput; import org.eclipse.emf.cdo.common.protocol.CDOProtocol.CommitNotificationInfo; @@ -51,7 +52,6 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl; import java.io.IOException; @@ -474,16 +474,9 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori private ResourceSet createResourceSet(InternalCDOPackageRegistry packageRegistry) { - ResourceSet resourceSet = new ResourceSetImpl() - { - @Override - protected void demandLoad(Resource resource) throws IOException - { - // Do nothing: we don't want this ResourceSet to attempt demand-loads. - } - }; - Resource.Factory resourceFactory = new EcoreResourceFactoryImpl(); + + ResourceSet resourceSet = new ExtResourceSet(true, false); resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", resourceFactory); //$NON-NLS-1$ resourceSet.setPackageRegistry(packageRegistry); return resourceSet; |