Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/LoadPackageRequest.java')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/LoadPackageRequest.java13
1 files changed, 9 insertions, 4 deletions
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;
}
}

Back to the top