Offline Example

1 files changed, 23 insertions, 16 deletions

diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
index 6d984ab898..f5d76a1700 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
@@ -232,11 +232,7 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i
     {
       if (newSignalScheduled)
       {
-        IListener[] listeners = getListeners();
-        if (listeners != null)
-        {
-          fireEvent(new SignalScheduledEvent<INFRA_STRUCTURE>(this, signal), listeners);
-        }
+        fireSignalScheduledEvent(signal);
       }
 
       BufferInputStream inputStream = signal.getBufferInputStream();
@@ -431,12 +427,7 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i
       signals.put(correlationID, signalActor);
     }
 
-    IListener[] listeners = getListeners();
-    if (listeners != null)
-    {
-      fireEvent(new SignalScheduledEvent<INFRA_STRUCTURE>(this, signalActor), listeners);
-    }
-
+    fireSignalScheduledEvent(signalActor);
     signalActor.runSync();
   }
 
@@ -449,11 +440,7 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i
       signals.notifyAll();
     }
 
-    IListener[] listeners = getListeners();
-    if (listeners != null)
-    {
-      fireEvent(new SignalFinishedEvent<INFRA_STRUCTURE>(this, signal, exception), listeners);
-    }
+    fireSignalFinishedEvent(signal, exception);
   }
 
   void handleRemoteException(int correlationID, Throwable t, boolean responding)
@@ -522,6 +509,26 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i
     }
   }
 
+  private void fireSignalScheduledEvent(Signal signal)
+  {
+    IListener[] listeners = getListeners();
+    if (listeners != null)
+    {
+      IEvent event = new SignalScheduledEvent<INFRA_STRUCTURE>(this, signal);
+      fireEvent(event, listeners);
+    }
+  }
+
+  private void fireSignalFinishedEvent(Signal signal, Exception exception)
+  {
+    IListener[] listeners = getListeners();
+    if (listeners != null)
+    {
+      IEvent event = new SignalFinishedEvent<INFRA_STRUCTURE>(this, signal, exception);
+      fireEvent(event, listeners);
+    }
+  }
+
   /**
    * An {@link IEvent event} fired from a {@link ISignalProtocol signal protocol} when the protocol {@link ISignalProtocol#setTimeout(long) timeout}
    * has been changed.