summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-04-14 04:23:06 (EDT)
committerEike Stepper2008-04-14 04:23:06 (EDT)
commita37023554404832da799b3454ce408c1fd672baf (patch)
treeba4b5801f29a4764c061b1d348bff3c6911d3acd
parent7d9620fa8eaa07476041e20ddd1d6402fee3bc24 (diff)
downloadcdo-a37023554404832da799b3454ce408c1fd672baf.zip
cdo-a37023554404832da799b3454ce408c1fd672baf.tar.gz
cdo-a37023554404832da799b3454ce408c1fd672baf.tar.bz2
[226317] Multiple Inheritence Wrong featureID
https://bugs.eclipse.org/bugs/show_bug.cgi?id=226317
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadChunkIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadChunkIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadChunkIndication.java
index e34097e..4dbf9b6 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadChunkIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadChunkIndication.java
@@ -74,7 +74,7 @@ public class LoadChunkIndication extends CDOReadIndication
CDOClassRef classRef = CDOModelUtil.readClassRef(in);
int featureID = in.readInt();
CDOClass cdoClass = classRef.resolve(getPackageManager());
- feature = cdoClass.lookupFeature(featureID);
+ feature = cdoClass.getAllFeatures()[featureID];
if (PROTOCOL.isEnabled())
{
PROTOCOL.format("Read feature: {0}", feature);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java
index c147a0f..6d26121 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java
@@ -91,7 +91,7 @@ public class LoadChunkRequest extends CDOClientRequest<CDOID>
}
CDOClassRef classRef = feature.getContainingClass().createClassRef();
CDOModelUtil.writeClassRef(out, classRef);
- out.writeInt(feature.getFeatureID());
+ out.writeInt(feature.getFeatureIndex());
if (PROTOCOL.isEnabled())
{
PROTOCOL.format("Writing fromIndex: {0}", fromIndex);