[273771] Commit timeout

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

1 files changed, 24 insertions, 2 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 37d976c580..dd7fbd8c13 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
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
@@ -256,12 +256,26 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i
   @Override
   public String toString()
   {
-    return MessageFormat.format("SignalProtocol[{0}]", getType()); //$NON-NLS-1$ 
+    return MessageFormat.format("SignalProtocol[{0}]", getType()); //$NON-NLS-1$
   }
 
   @Override
   protected void doDeactivate() throws Exception
   {
+    for (Signal signal : getSignals())
+    {
+      if (signal instanceof RequestWithConfirmation<?>)
+      {
+        RequestWithConfirmation<?> request = (RequestWithConfirmation<?>)signal;
+        request.setRemoteException(new IllegalStateException("Request canceled due to protocol deactivation"), false);
+      }
+    }
+
+    synchronized (signals)
+    {
+      signals.clear();
+    }
+
     failOverStrategy = null;
     IChannel channel = getChannel();
     if (channel != null)
@@ -324,6 +338,14 @@ public class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> i
     return null;
   }
 
+  private Signal[] getSignals()
+  {
+    synchronized (signals)
+    {
+      return signals.values().toArray(new Signal[signals.size()]);
+    }
+  }
+
   synchronized int getNextCorrelationID()
   {
     int correlationID = nextCorrelationID;