[486458] Provide support for optimized loading and notifying of object units

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

2 files changed, 12 insertions, 4 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditClassMapping.java
index 3bea329fe8..03b35b9a67 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditClassMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalAuditClassMapping.java
@@ -854,7 +854,7 @@ public class HorizontalAuditClassMapping extends AbstractHorizontalClassMapping
       finally
       {
         latch.countDown();
-        StoreThreadLocal.release();
+        StoreThreadLocal.remove();
       }
     }
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/StoreThreadLocal.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/StoreThreadLocal.java
index e9d6146175..b32f90317b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/StoreThreadLocal.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/StoreThreadLocal.java
@@ -121,13 +121,21 @@ public final class StoreThreadLocal
     }
     finally
     {
-      ACCESSOR.remove();
-      SESSION.remove();
-      COMMIT_CONTEXT.remove();
+      remove();
     }
   }
 
   /**
+   * @since 4.5
+   */
+  public static void remove()
+  {
+    ACCESSOR.remove();
+    SESSION.remove();
+    COMMIT_CONTEXT.remove();
+  }
+
+  /**
    * An {@link IllegalStateException} that can be thrown from {@link StoreThreadLocal#getSession()}.
    *
    * @author Eike Stepper