diff options
4 files changed, 13 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java index d97c60764b..cfa40f19a5 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java @@ -120,6 +120,7 @@ public class AttributeTest extends AbstractCDOTest { assertEquals(storeByteArray[i], saveByteArray[i]); } + view.close(); session.close(); } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/CDOClientProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/CDOClientProtocol.java index 0729675161..6b00ac0883 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/CDOClientProtocol.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/CDOClientProtocol.java @@ -85,9 +85,9 @@ public class CDOClientProtocol extends CDOProtocolImpl implements CDOSessionProt return send(new RepositoryTimeRequest(this)); } - public String loadPackage(CDOPackage cdoPackage, boolean onlyEcore) + public void loadPackage(CDOPackage cdoPackage, boolean onlyEcore) { - return send(new LoadPackageRequest(this, cdoPackage, onlyEcore)); + send(new LoadPackageRequest(this, cdoPackage, onlyEcore)); } public Object loadChunk(InternalCDORevision revision, CDOFeature feature, int accessIndex, int fetchIndex, diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/LoadPackageRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/LoadPackageRequest.java index 402614a030..f0efd04cca 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/LoadPackageRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/LoadPackageRequest.java @@ -14,13 +14,14 @@ import org.eclipse.emf.cdo.common.io.CDODataInput; import org.eclipse.emf.cdo.common.io.CDODataOutput; import org.eclipse.emf.cdo.common.model.CDOPackage; import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants; +import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackage; import java.io.IOException; /** * @author Eike Stepper */ -public class LoadPackageRequest extends CDOClientRequest<String> +public class LoadPackageRequest extends CDOClientRequest<Object> { private CDOPackage cdoPackage; @@ -41,14 +42,18 @@ public class LoadPackageRequest extends CDOClientRequest<String> } @Override - protected String confirming(CDODataInput in) throws IOException + protected Object confirming(CDODataInput in) throws IOException { if (onlyEcore) { - return in.readString(); + String ecore = in.readString(); + ((InternalCDOPackage)cdoPackage).setEcore(ecore); + } + else + { + in.readCDOPackage(cdoPackage); } - in.readCDOPackage(cdoPackage); return null; } } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java index 86192d0173..ed68cdbff3 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java @@ -60,7 +60,7 @@ public interface CDOSessionProtocol public RepositoryTimeResult getRepositoryTime(); - public String loadPackage(CDOPackage cdoPackage, boolean onlyEcore); + public void loadPackage(CDOPackage cdoPackage, boolean onlyEcore); public Object loadChunk(InternalCDORevision revision, CDOFeature feature, int accessIndex, int fetchIndex, int fromIndex, int toIndex); |