[406068] Memory leak through CDOPackageInfo adapters on EPackages

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

17 files changed, 109 insertions, 45 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
index 0632e3a451..42611cc672 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
@@ -60,7 +60,7 @@ import java.util.Map;
 
 /**
  * A JDBC-based {@link CDORevisionCache}.
- * 
+ *
  * @author Andre Dietisheim
  */
 public class DBRevisionCache extends Lifecycle implements InternalCDORevisionCache
@@ -154,7 +154,7 @@ public class DBRevisionCache extends Lifecycle implements InternalCDORevisionCac
 
   /**
    * Gets the revision with the highest version for a given {@link CDOID}.
-   * 
+   *
    * @param id
    *          the id to match
    * @return the revision that was found
@@ -223,7 +223,7 @@ public class DBRevisionCache extends Lifecycle implements InternalCDORevisionCac
   /**
    * Gets an {@link InternalCDORevision} that matches the given timestamp (it is >= created timestamp AND <= revised
    * timestamp of the revision).
-   * 
+   *
    * @param id
    *          the id
    * @return the revision by time
@@ -288,7 +288,7 @@ public class DBRevisionCache extends Lifecycle implements InternalCDORevisionCac
 
   /**
    * Gets a {@link InternalCDORevision} by a given id and version.
-   * 
+   *
    * @param id
    *          the id to match the revision against
    * @return the revision by version
@@ -352,7 +352,7 @@ public class DBRevisionCache extends Lifecycle implements InternalCDORevisionCac
 
   /**
    * Gets the latest revisions of all persisted model versions.
-   * 
+   *
    * @return the revisions
    */
   public List<CDORevision> getCurrentRevisions()
@@ -419,7 +419,7 @@ public class DBRevisionCache extends Lifecycle implements InternalCDORevisionCac
   /**
    * Adds a given revision to this cache. It furthermore updates the revised timestamp of the latest (before inserting
    * the new one) revision
-   * 
+   *
    * @param revision
    *          the revision to add to this cache
    */
@@ -530,7 +530,7 @@ public class DBRevisionCache extends Lifecycle implements InternalCDORevisionCac
       /**
        * Sets the values in the prepared statment, that are related to the given revision. If the revision is a resource
        * node, the values are set otherwise the fields are set to <tt>null</tt>
-       * 
+       *
        * @param revision
        *          the revision
        * @param preparedStatement
@@ -559,7 +559,7 @@ public class DBRevisionCache extends Lifecycle implements InternalCDORevisionCac
   /**
    * Removes a revision by its Id and version. If the given revision does not exist <tt>null</tt> is returned. Otherwise
    * the {@link InternalCDORevision}, that was removed is returned
-   * 
+   *
    * @param id
    *          the id of the revision to remove
    * @return the {@link InternalCDORevision} that was removed, <tt>null</tt> otherwise
@@ -678,7 +678,7 @@ public class DBRevisionCache extends Lifecycle implements InternalCDORevisionCac
 
   /**
    * Creates the (single) table that's used to store the cached revisions.
-   * 
+   *
    * @throws SQLException
    *           Signals that an error has occured while getting the connection or committing the transaction
    */
@@ -716,7 +716,7 @@ public class DBRevisionCache extends Lifecycle implements InternalCDORevisionCac
    * correct type and the revised timestamp is set separatley. Whe you insert a new revision into this cache, the former
    * latest revision gets a new revised timestamp. This timestamp's only updated in the database column 'revised', not
    * in the blob that holds the serialized instance. Therefore the revised timestamp has to be set separately
-   * 
+   *
    * @param revisedTimestamp
    *          the revised timestamp to set to the revision
    * @param blob
@@ -740,8 +740,7 @@ public class DBRevisionCache extends Lifecycle implements InternalCDORevisionCac
   {
     return new CDODataInputImpl(inputStream)
     {
-      @Override
-      protected CDOPackageRegistry getPackageRegistry()
+      public CDOPackageRegistry getPackageRegistry()
       {
         return packageRegistry;
       }
@@ -780,7 +779,7 @@ public class DBRevisionCache extends Lifecycle implements InternalCDORevisionCac
 
   /**
    * Converts a given {@link CDORevision} to a byte array.
-   * 
+   *
    * @param revision
    *          the revision
    * @return the array of bytes for the given revision
@@ -816,7 +815,7 @@ public class DBRevisionCache extends Lifecycle implements InternalCDORevisionCac
   /**
    * Gets a connection from the {@link IDBConnectionProvider} within this cache. The Connection is set not to auto
    * commit transactions.
-   * 
+   *
    * @return the connection
    * @throws SQLException
    *           Signals that an error occured while getting the connection from the connection provider
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageInfo.java
index 53b9814ed6..586e89c78b 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/CDOPackageInfo.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.common.model;
 
 import org.eclipse.emf.cdo.common.model.CDOPackageUnit.State;
 
+import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EPackage.Descriptor;
 
@@ -32,7 +33,7 @@ import org.eclipse.emf.ecore.EPackage.Descriptor;
  * @apiviz.has {@link org.eclipse.emf.ecore.EPackage}
  * @apiviz.composedOf {@link CDOClassInfo}
  */
-public interface CDOPackageInfo extends EPackage.Descriptor, Comparable<CDOPackageInfo>
+public interface CDOPackageInfo extends Adapter, EPackage.Descriptor, Comparable<CDOPackageInfo>
 {
   /**
    * Returns the package unit containing this package info.
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java
index 85be7ab966..21d4ee70d6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDODataInput.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.cdo.common.lock.CDOLockState;
 import org.eclipse.emf.cdo.common.lock.IDurableLockingManager.LockArea;
 import org.eclipse.emf.cdo.common.model.CDOClassifierRef;
 import org.eclipse.emf.cdo.common.model.CDOPackageInfo;
+import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
 import org.eclipse.emf.cdo.common.model.CDOPackageUnit;
 import org.eclipse.emf.cdo.common.model.CDOType;
 import org.eclipse.emf.cdo.common.revision.CDOIDAndBranch;
@@ -164,4 +165,9 @@ public interface CDODataInput extends ExtendedDataInput
    * @since 4.1
    */
   public LockArea readCDOLockArea() throws IOException;
+
+  /**
+   * @since 4.2
+   */
+  public CDOPackageRegistry getPackageRegistry();
 }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonUtil.java
index 4eb2b90f41..0cd4fb6f41 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/util/CDOCommonUtil.java
@@ -71,8 +71,7 @@ public final class CDOCommonUtil
   {
     return new CDODataInputImpl(inputStream)
     {
-      @Override
-      protected CDOPackageRegistry getPackageRegistry()
+      public CDOPackageRegistry getPackageRegistry()
       {
         return packageRegistry;
       }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java
index 8f2dc36fc5..34a4ab4e83 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageInfoImpl.java
@@ -16,10 +16,13 @@ import org.eclipse.emf.cdo.common.protocol.CDODataInput;
 import org.eclipse.emf.cdo.common.protocol.CDODataOutput;
 import org.eclipse.emf.cdo.internal.common.bundle.OM;
 import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageInfo;
+import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry;
 import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit;
 
 import org.eclipse.net4j.util.om.trace.ContextTracer;
 
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.emf.ecore.EPackage;
 
@@ -116,6 +119,11 @@ public class CDOPackageInfoImpl implements InternalCDOPackageInfo
     return ePackage;
   }
 
+  public void setEPackage(EPackage ePackage)
+  {
+    this.ePackage = ePackage;
+  }
+
   public boolean isCorePackage()
   {
     return CDOModelUtil.isCorePackage(getEPackage());
@@ -146,4 +154,44 @@ public class CDOPackageInfoImpl implements InternalCDOPackageInfo
   {
     return MessageFormat.format("CDOPackageInfo[packageURI={0}, parentURI={1}]", packageURI, parentURI); //$NON-NLS-1$
   }
+
+  /**
+   * @deprecated As of 4.2 CDOPackageInfos are no longer mapped through Adapters.
+   * @see InternalCDOPackageRegistry#registerPackageInfo(EPackage, InternalCDOPackageInfo)
+   */
+  @Deprecated
+  public void notifyChanged(Notification notification)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  /**
+   * @deprecated As of 4.2 CDOPackageInfos are no longer mapped through Adapters.
+   * @see InternalCDOPackageRegistry#registerPackageInfo(EPackage, InternalCDOPackageInfo)
+   */
+  @Deprecated
+  public Notifier getTarget()
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  /**
+   * @deprecated As of 4.2 CDOPackageInfos are no longer mapped through Adapters.
+   * @see InternalCDOPackageRegistry#registerPackageInfo(EPackage, InternalCDOPackageInfo)
+   */
+  @Deprecated
+  public void setTarget(Notifier newTarget)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  /**
+   * @deprecated As of 4.2 CDOPackageInfos are no longer mapped through Adapters.
+   * @see InternalCDOPackageRegistry#registerPackageInfo(EPackage, InternalCDOPackageInfo)
+   */
+  @Deprecated
+  public boolean isAdapterForType(Object type)
+  {
+    throw new UnsupportedOperationException();
+  }
 }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java
index c8dd79a8e7..080742b794 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageRegistryImpl.java
@@ -284,6 +284,7 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements Inte
 
   public synchronized void registerPackageInfo(EPackage ePackage, InternalCDOPackageInfo packageInfo)
   {
+    packageInfo.setEPackage(ePackage);
     packageInfoMap.put(ePackage, packageInfo);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java
index ca23110573..21c6622b32 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java
@@ -281,12 +281,24 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
 
   public void read(CDODataInput in, ResourceSet resourceSet) throws IOException
   {
+    if (packageRegistry == null)
+    {
+      packageRegistry = (InternalCDOPackageRegistry)in.getPackageRegistry();
+      if (packageRegistry == null)
+      {
+        EPackage.Registry resourceSetPackageRegistry = resourceSet.getPackageRegistry();
+        if (resourceSetPackageRegistry instanceof InternalCDOPackageRegistry)
+        {
+          packageRegistry = (InternalCDOPackageRegistry)resourceSetPackageRegistry;
+        }
+      }
+    }
+
     EPackage ePackage = null;
     boolean withPackages = in.readBoolean();
     if (withPackages)
     {
       CheckUtil.checkArg(resourceSet, "resourceSet"); //$NON-NLS-1$
-      CheckUtil.checkNull(resourceSet.getPackageRegistry(), "ResourceSet's packageRegistry == null");
       ePackage = CDOModelUtil.readPackage(in, resourceSet, true);
       EPackage globalPackage = loadPackageFromGlobalRegistry(ePackage.getNsURI());
       if (globalPackage != null)
@@ -337,8 +349,8 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit
     packageInfo.setPackageURI(ePackage.getNsURI());
     packageInfo.setParentURI(ePackage.getESuperPackage() == null ? null : ePackage.getESuperPackage().getNsURI());
 
-    packageRegistry.registerPackageInfo(ePackage, packageInfo);
     packageRegistry.basicPut(ePackage.getNsURI(), ePackage);
+    packageRegistry.registerPackageInfo(ePackage, packageInfo);
 
     result.add(packageInfo);
     for (EPackage subPackage : ePackage.getESubpackages())
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageInfo.java
index cf2bb7417a..5dc18f18fa 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageInfo.java
@@ -14,6 +14,8 @@ import org.eclipse.emf.cdo.common.model.CDOPackageInfo;
 import org.eclipse.emf.cdo.common.protocol.CDODataInput;
 import org.eclipse.emf.cdo.common.protocol.CDODataOutput;
 
+import org.eclipse.emf.ecore.EPackage;
+
 import java.io.IOException;
 
 /**
@@ -35,6 +37,11 @@ public interface InternalCDOPackageInfo extends CDOPackageInfo
   public void setParentURI(String parentURI);
 
   /**
+   * @since 4.2
+   */
+  public void setEPackage(EPackage ePackage);
+
+  /**
    * @since 3.0
    */
   public void write(CDODataOutput out) throws IOException;
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java
index a5f5f21d71..c80e872627 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/protocol/CDODataInputImpl.java
@@ -626,8 +626,6 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
     return StringIO.DIRECT;
   }
 
-  protected abstract CDOPackageRegistry getPackageRegistry();
-
   protected abstract CDOBranchManager getBranchManager();
 
   protected abstract CDOCommitInfoManager getCommitInfoManager();
@@ -654,8 +652,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
       throw new UnsupportedOperationException();
     }
 
-    @Override
-    protected CDOPackageRegistry getPackageRegistry()
+    public CDOPackageRegistry getPackageRegistry()
     {
       throw new UnsupportedOperationException();
     }
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java
index 6498b5da49..c58ca2f522 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionImpl.java
@@ -123,14 +123,7 @@ public class CDONet4jSessionImpl extends CDOSessionImpl implements org.eclipse.e
   @Override
   protected void doActivate() throws Exception
   {
-    OpenSessionResult result = openSession();
-    if (result == null)
-    {
-      throw new NotAuthenticatedException();
-    }
-
-    super.doActivate();
-
+    // Package registry must be available when CDOPackageUnits are received in the open session response!
     InternalCDOPackageRegistry packageRegistry = getPackageRegistry();
     if (packageRegistry == null)
     {
@@ -142,6 +135,14 @@ public class CDONet4jSessionImpl extends CDOSessionImpl implements org.eclipse.e
     packageRegistry.setPackageLoader(this);
     packageRegistry.activate();
 
+    OpenSessionResult result = openSession();
+    if (result == null)
+    {
+      throw new NotAuthenticatedException();
+    }
+
+    super.doActivate();
+
     InternalCDORevisionManager revisionManager = getRevisionManager();
     if (revisionManager == null)
     {
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientIndication.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientIndication.java
index 05921a3b92..9f69a245ba 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientIndication.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientIndication.java
@@ -67,8 +67,7 @@ public abstract class CDOClientIndication extends Indication
         return CDOListWithElementProxiesImpl.FACTORY;
       }
 
-      @Override
-      protected CDOPackageRegistry getPackageRegistry()
+      public CDOPackageRegistry getPackageRegistry()
       {
         return getSession().getPackageRegistry();
       }
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequest.java
index 670f640ee7..49ea57b91e 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequest.java
@@ -89,8 +89,7 @@ public abstract class CDOClientRequest<RESULT> extends RequestWithConfirmation<R
   {
     return confirming(new CDODataInputImpl(in)
     {
-      @Override
-      protected CDOPackageRegistry getPackageRegistry()
+      public CDOPackageRegistry getPackageRegistry()
       {
         return getSession().getPackageRegistry();
       }
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequestWithMonitoring.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequestWithMonitoring.java
index 014e108d02..2a8f2de463 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequestWithMonitoring.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequestWithMonitoring.java
@@ -122,8 +122,7 @@ public abstract class CDOClientRequestWithMonitoring<RESULT> extends RequestWith
         return getProtocol().getPackageURICompressor();
       }
 
-      @Override
-      protected CDOPackageRegistry getPackageRegistry()
+      public CDOPackageRegistry getPackageRegistry()
       {
         return getSession().getPackageRegistry();
       }
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeFileHandle.java b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeFileHandle.java
index 52b5491c35..f03195200f 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeFileHandle.java
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/src/org/eclipse/emf/cdo/server/internal/lissome/LissomeFileHandle.java
@@ -183,8 +183,7 @@ public class LissomeFileHandle extends DataInputOutputFile implements CDODataInp
         return super.readCDORevision(freeze);
       }
 
-      @Override
-      protected CDOPackageRegistry getPackageRegistry()
+      public CDOPackageRegistry getPackageRegistry()
       {
         return LissomeFileHandle.this.getPackageRegistry();
       }
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java
index c1e66e72bb..e7e6e755d4 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java
@@ -84,8 +84,7 @@ public abstract class CDOServerIndication extends IndicationWithResponse
   {
     indicating(new CDODataInputImpl(in)
     {
-      @Override
-      protected CDOPackageRegistry getPackageRegistry()
+      public CDOPackageRegistry getPackageRegistry()
       {
         return getRepository().getPackageRegistry();
       }
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndicationWithMonitoring.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndicationWithMonitoring.java
index 1b634eee5f..af933f5d84 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndicationWithMonitoring.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndicationWithMonitoring.java
@@ -108,8 +108,7 @@ public abstract class CDOServerIndicationWithMonitoring extends IndicationWithMo
     {
       indicating(new CDODataInputImpl(in)
       {
-        @Override
-        protected CDOPackageRegistry getPackageRegistry()
+        public CDOPackageRegistry getPackageRegistry()
         {
           return CDOServerIndicationWithMonitoring.this.getPackageRegistry();
         }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
index 91f85438d8..08881ed826 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
@@ -2003,8 +2003,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     {
       CDODataInput in = new CDODataInputImpl(new ExtendedDataInputStream(stream))
       {
-        @Override
-        protected CDOPackageRegistry getPackageRegistry()
+        public CDOPackageRegistry getPackageRegistry()
         {
           return getSession().getPackageRegistry();
         }