1 files changed, 83 insertions, 79 deletions
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionIndication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionIndication.java
index bd9411fd9a..6eee8c0ee2 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionIndication.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RemoteExceptionIndication.java
@@ -1,79 +1,83 @@
-/*
- * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * 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
- */
-package org.eclipse.net4j.signal;
-
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-import org.eclipse.net4j.util.io.ExtendedIOUtil;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-
-import org.eclipse.internal.net4j.bundle.OM;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-
-/**
- * @author Eike Stepper
- */
-class RemoteExceptionIndication extends Indication
-{
-  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SIGNAL, RemoteExceptionIndication.class);
-
-  private Throwable t;
-
-  public RemoteExceptionIndication(SignalProtocol<?> protocol)
-  {
-    super(protocol, SignalProtocol.SIGNAL_REMOTE_EXCEPTION);
-  }
-
-  @Override
-  protected void indicating(ExtendedDataInputStream in) throws Exception
-  {
-    int correlationID = in.readInt();
-    boolean responding = in.readBoolean();
-    String message = in.readString();
-    if (TRACER.isEnabled())
-    {
-      String msg = RemoteExceptionRequest.getFirstLine(message);
-      TRACER.format("Reading remote exception for signal {0}: {1}", correlationID, msg); //$NON-NLS-1$
-    }
-
-    try
-    {
-      t = deserializeThrowable(in.readByteArray());
-    }
-    catch (Throwable couldNotLoadExceptionClass)
-    {
-      // Fall through
-    }
-
-    if (t == null)
-    {
-      t = new RemoteException(message, responding);
-    }
-
-    getProtocol().handleRemoteException(correlationID, t, responding);
-  }
-
-  public static Throwable deserializeThrowable(byte[] bytes)
-  {
-    try
-    {
-      ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
-      DataInputStream dis = new DataInputStream(bais);
-      return (Throwable)ExtendedIOUtil.readObject(dis, OM.class.getClassLoader());
-    }
-    catch (IOException ex)
-    {
-      return null;
-    }
-  }
-}
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * 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
+ */
+package org.eclipse.net4j.signal;
+
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedIOUtil;
+import org.eclipse.net4j.util.om.trace.ContextTracer;
+
+import org.eclipse.internal.net4j.bundle.OM;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+
+/**
+ * @author Eike Stepper
+ */
+class RemoteExceptionIndication extends Indication
+{
+  private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SIGNAL, RemoteExceptionIndication.class);
+
+  private Throwable t;
+
+  public RemoteExceptionIndication(SignalProtocol<?> protocol)
+  {
+    super(protocol, SignalProtocol.SIGNAL_REMOTE_EXCEPTION);
+  }
+
+  @Override
+  protected void indicating(ExtendedDataInputStream in) throws Exception
+  {
+    int correlationID = in.readInt();
+    boolean responding = in.readBoolean();
+    String message = in.readString();
+    if (TRACER.isEnabled())
+    {
+      String msg = RemoteExceptionRequest.getFirstLine(message);
+      TRACER.format("Reading remote exception for signal {0}: {1}", correlationID, msg); //$NON-NLS-1$
+    }
+
+    try
+    {
+      t = deserializeThrowable(in.readByteArray());
+    }
+    catch (Throwable couldNotLoadExceptionClass)
+    {
+      // Fall through
+    }
+
+    if (t == null)
+    {
+      t = new RemoteException(message, responding);
+    }
+
+    SignalProtocol<?> protocol = getProtocol();
+    if (protocol != null)
+    {
+      protocol.handleRemoteException(correlationID, t, responding);
+    }
+  }
+
+  public static Throwable deserializeThrowable(byte[] bytes)
+  {
+    try
+    {
+      ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+      DataInputStream dis = new DataInputStream(bais);
+      return (Throwable)ExtendedIOUtil.readObject(dis, OM.class.getClassLoader());
+    }
+    catch (IOException ex)
+    {
+      return null;
+    }
+  }
+}