*** empty log message ***

3 files changed, 17 insertions, 20 deletions

diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java
index c6b919a5eb..1bc496c100 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java
@@ -115,7 +115,8 @@ public class SignalTest extends AbstractOMTest
   {
     ExecutorService threadPool = Executors.newCachedThreadPool();
     IRegistry<String, ProtocolFactory> registry = new HashMapRegistry();
-    registry.register(new TestSignalProtocol.Factory());
+    TestSignalProtocol.Factory factory = new TestSignalProtocol.Factory();
+    registry.put(factory.getID(), factory);
 
     acceptor.setReceiveExecutor(threadPool);
     acceptor.setProtocolFactoryRegistry(registry);
@@ -136,7 +137,8 @@ public class SignalTest extends AbstractOMTest
   {
     ExecutorService threadPool = Executors.newCachedThreadPool();
     IRegistry<String, ProtocolFactory> registry = new HashMapRegistry();
-    registry.register(new TestSignalProtocol.Factory());
+    TestSignalProtocol.Factory factory = new TestSignalProtocol.Factory();
+    registry.put(factory.getID(), factory);
 
     acceptor.setReceiveExecutor(threadPool);
     acceptor.setProtocolFactoryRegistry(registry);
diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
index c31d41117e..dea782a1a0 100644
--- a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
@@ -28,6 +28,7 @@ Export-Package: org.eclipse.internal.net4j.transport;version="0.8.0",
  org.eclipse.net4j.util.om.log;version="0.8.0",
  org.eclipse.net4j.util.om.trace;version="0.8.0",
  org.eclipse.net4j.util.registry;version="0.8.0",
+ org.eclipse.net4j.util.registry.delegating;version="0.8.0",
  org.eclipse.net4j.util.stream;version="0.8.0"
 Eclipse-LazyStart: true
 Require-Bundle: org.eclipse.core.runtime;resolution:=optional
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/AbstractRegistry.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/AbstractRegistry.java
index 93b8691f7e..8b8c8084a7 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/AbstractRegistry.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/AbstractRegistry.java
@@ -108,11 +108,7 @@ public abstract class AbstractRegistry<K, V> implements IRegistry<K, V>
   public synchronized V put(K key, V value)
   {
     V result = getTransaction().put(key, value);
-    if (autoCommit)
-    {
-      commit();
-    }
-
+    autoCommit();
     return result;
   }
 
@@ -132,10 +128,7 @@ public abstract class AbstractRegistry<K, V> implements IRegistry<K, V>
         transaction.put(e.getKey(), e.getValue());
       }
 
-      if (autoCommit)
-      {
-        commit();
-      }
+      autoCommit();
     }
   }
 
@@ -146,11 +139,7 @@ public abstract class AbstractRegistry<K, V> implements IRegistry<K, V>
   public synchronized V remove(Object key)
   {
     V result = getTransaction().remove(key);
-    if (autoCommit)
-    {
-      commit();
-    }
-
+    autoCommit();
     return result;
   }
 
@@ -169,10 +158,7 @@ public abstract class AbstractRegistry<K, V> implements IRegistry<K, V>
         transaction.remove(key);
       }
 
-      if (autoCommit)
-      {
-        commit();
-      }
+      autoCommit();
     }
   }
 
@@ -284,6 +270,14 @@ public abstract class AbstractRegistry<K, V> implements IRegistry<K, V>
     }
   }
 
+  protected void autoCommit()
+  {
+    if (autoCommit)
+    {
+      commit();
+    }
+  }
+
   protected abstract Map<K, V> getMap();
 
   /**