[236784] Invalidate and cache problem

https://bugs.eclipse.org/bugs/show_bug.cgi?id=236784

3 files changed, 15 insertions, 23 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOID.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOID.java
index fb4b0d11bc..292f631be8 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOID.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOID.java
@@ -10,10 +10,6 @@
  **************************************************************************/
 package org.eclipse.emf.cdo.common.id;
 
-import org.eclipse.net4j.util.io.ExtendedDataInput;
-import org.eclipse.net4j.util.io.ExtendedDataOutput;
-
-import java.io.IOException;
 import java.io.Serializable;
 
 /**
@@ -35,10 +31,6 @@ public interface CDOID extends Serializable
 
   public boolean isTemporary();
 
-  public void read(ExtendedDataInput in) throws IOException;
-
-  public void write(ExtendedDataOutput out) throws IOException;
-
   /**
    * @author Eike Stepper
    */
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java
index 2ae20f9797..f8cdef6285 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/id/CDOIDUtil.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.cdo.internal.common.id.CDOIDMetaImpl;
 import org.eclipse.emf.cdo.internal.common.id.CDOIDMetaRangeImpl;
 import org.eclipse.emf.cdo.internal.common.id.CDOIDTempMetaImpl;
 import org.eclipse.emf.cdo.internal.common.id.CDOIDTempObjectImpl;
+import org.eclipse.emf.cdo.spi.common.AbstractCDOID;
 import org.eclipse.emf.cdo.spi.common.CDOIDLibraryDescriptorImpl;
 import org.eclipse.emf.cdo.spi.common.CDOIDLongImpl;
 
@@ -128,7 +129,7 @@ public final class CDOIDUtil
       case LEGACY_OBJECT:
       {
         CDOIDObject id = factory.createCDOIDObject(in);
-        id.read(in);
+        ((AbstractCDOID)id).read(in);
         CDOClassRef classRef = CDOModelUtil.readClassRef(in);
         return id.asLegacy(classRef);
       }
@@ -156,14 +157,14 @@ public final class CDOIDUtil
     case OBJECT:
     {
       CDOIDObject id = factory.createCDOIDObject(in);
-      id.read(in);
-      return id;// new CDOIDLongImpl(in.readLong());
+      ((AbstractCDOID)id).read(in);
+      return id;
     }
 
     case LEGACY_OBJECT:
     {
       CDOIDObject id = factory.createCDOIDObject(in);
-      id.read(in);
+      ((AbstractCDOID)id).read(in);
       CDOModelUtil.readClassRef(in); // Discard classRef from stream
       return id;
     }
@@ -206,7 +207,7 @@ public final class CDOIDUtil
 
       case LEGACY_OBJECT:
         CDOIDObject legacy = (CDOIDObject)id;
-        legacy.write(out);
+        ((AbstractCDOID)legacy).write(out);
         CDOModelUtil.writeClassRef(out, legacy.getClassRef());
         return;
 
@@ -216,7 +217,7 @@ public final class CDOIDUtil
     }
 
     // Not asLegacy
-    id.write(out);
+    ((AbstractCDOID)id).write(out);
   }
 
   public static CDOIDMeta createMeta(long value)
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractCDOID.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractCDOID.java
index b4d9a5594e..f393e18de9 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractCDOID.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/AbstractCDOID.java
@@ -12,6 +12,11 @@ package org.eclipse.emf.cdo.spi.common;
 
 import org.eclipse.emf.cdo.common.id.CDOID;
 
+import org.eclipse.net4j.util.io.ExtendedDataInput;
+import org.eclipse.net4j.util.io.ExtendedDataOutput;
+
+import java.io.IOException;
+
 /**
  * @author Eike Stepper
  */
@@ -82,13 +87,7 @@ public abstract class AbstractCDOID implements CDOID
     }
   }
 
-  // public CDOClassRef getClassRef()
-  // {
-  // return null;
-  // }
-  //
-  // public CDOID asLegacy(CDOClassRef classRef)
-  // {
-  // throw new UnsupportedOperationException();
-  // }
+  public abstract void read(ExtendedDataInput in) throws IOException;
+
+  public abstract void write(ExtendedDataOutput out) throws IOException;
 }