[387564] Ensure lock notification sending after invalidation for "lock/unlock objects on commit"

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

2 files changed, 20 insertions, 2 deletions

diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RunnableWithName.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RunnableWithName.java
index ef72c20d90..cce82fb489 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RunnableWithName.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RunnableWithName.java
@@ -11,6 +11,7 @@
 package org.eclipse.net4j.util.concurrent;
 
 import org.eclipse.net4j.util.StringUtil;
+import org.eclipse.net4j.util.om.OMPlatform;
 
 /**
  * @author Eike Stepper
@@ -18,10 +19,17 @@ import org.eclipse.net4j.util.StringUtil;
  */
 public abstract class RunnableWithName implements Runnable
 {
-  public abstract String getName();
+  private static final boolean DISABLE_RUNNABLE_NAMES = Boolean.parseBoolean(
+      OMPlatform.INSTANCE.getProperty("org.eclipse.net4j.util.concurrent.DISABLE_RUNNABLE_NAMES", "false"));
 
   public final void run()
   {
+    if (DISABLE_RUNNABLE_NAMES)
+    {
+      doRun();
+      return;
+    }
+
     Thread thread = null;
     String oldName = null;
 
@@ -54,5 +62,7 @@ public abstract class RunnableWithName implements Runnable
     }
   }
 
+  public abstract String getName();
+
   protected abstract void doRun();
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/Event.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/Event.java
index b30c90f465..fa9197de6f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/Event.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/Event.java
@@ -38,7 +38,15 @@ public class Event extends EventObject implements IEvent
   {
     String params = formatAdditionalParameters();
     params = params == null ? "" : ", " + params;
-    return MessageFormat.format("{0}[source={1}{2}]", getClass().getSimpleName(), getSource(), params);
+    return MessageFormat.format("{0}[source={1}{2}]", formatEventName(), getSource(), params);
+  }
+
+  /**
+   * @since 3.7
+   */
+  protected String formatEventName()
+  {
+    return getClass().getSimpleName();
   }
 
   /**