[252118] SessionConfig: Eager used instead of Lazy

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

3 files changed, 18 insertions, 14 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java
index 89393092e5..cdc59d42d7 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java
@@ -12,6 +12,8 @@
  **************************************************************************/
 package org.eclipse.emf.cdo.util;
 
+import org.eclipse.emf.internal.cdo.CDOFactoryImpl;
+
 import org.eclipse.net4j.util.io.IORuntimeException;
 
 import org.eclipse.emf.common.util.EList;
@@ -225,6 +227,20 @@ public final class EMFUtil
     return value.getClass() == EPackageImpl.class;
   }
 
+  /**
+   * @since 2.0
+   */
+  public static boolean prepareDynamicEPackage(EPackage ePackage)
+  {
+    if (isDynamicEPackage(ePackage))
+    {
+      ePackage.setEFactoryInstance(new CDOFactoryImpl(ePackage));
+      return true;
+    }
+
+    return false;
+  }
+
   public static boolean isMany(EStructuralFeature eFeature)
   {
     return eFeature.isMany();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java
index 054c13c2a4..029dd9573c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageRegistryImpl.java
@@ -39,7 +39,6 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
 
 import java.text.MessageFormat;
@@ -124,13 +123,8 @@ public class CDOPackageRegistryImpl extends EPackageRegistryImpl implements CDOP
         tracer.format("Registering package for {0}", key);
       }
 
-      if (EMFUtil.isDynamicEPackage(value))
-      {
-        EPackageImpl ePackage = (EPackageImpl)value;
-        ModelUtil.prepareDynamicEPackage(ePackage);
-      }
-
       EPackage ePackage = (EPackage)value;
+      EMFUtil.prepareDynamicEPackage(ePackage);
       CDOPackage cdoPackage = ModelUtil.getCDOPackage(ePackage, session.getPackageManager());
       CDOIDMetaRange metaIDRange = cdoPackage.getTopLevelPackage().getMetaIDRange();
       ((InternalCDOPackage)cdoPackage).setPersistent(metaIDRange != null && !metaIDRange.isTemporary());
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
index e883e078a4..5c7d5bc4cc 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
@@ -32,7 +32,6 @@ import org.eclipse.emf.cdo.spi.common.InternalCDOPackage;
 import org.eclipse.emf.cdo.util.CDOPackageRegistry;
 import org.eclipse.emf.cdo.util.EMFUtil;
 
-import org.eclipse.emf.internal.cdo.CDOFactoryImpl;
 import org.eclipse.emf.internal.cdo.CDOSessionImpl;
 import org.eclipse.emf.internal.cdo.CDOSessionPackageManagerImpl;
 import org.eclipse.emf.internal.cdo.bundle.OM;
@@ -354,7 +353,7 @@ public final class ModelUtil
 
   private static EPackageImpl prepareDynamicEPackage(EPackageImpl ePackage, String nsURI)
   {
-    prepareDynamicEPackage(ePackage);
+    EMFUtil.prepareDynamicEPackage(ePackage);
     EPackageImpl result = ObjectUtil.equals(ePackage.getNsURI(), nsURI) ? ePackage : null;
     for (EPackage subPackage : ePackage.getESubpackages())
     {
@@ -368,11 +367,6 @@ public final class ModelUtil
     return result;
   }
 
-  public static void prepareDynamicEPackage(EPackageImpl ePackage)
-  {
-    ePackage.setEFactoryInstance(new CDOFactoryImpl(ePackage));
-  }
-
   public static CDOClassRef createClassRef(EClassifier classifier)
   {
     if (classifier instanceof EClass)