[249332] NPE due to missing protocol in SignalActor.<init>

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

1 files changed, 9 insertions, 6 deletions

diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/connector/Connector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/connector/Connector.java
index a35ef74b49..4350211a84 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/connector/Connector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/connector/Connector.java
@@ -60,17 +60,15 @@ public abstract class Connector extends Container<IChannel> implements InternalC
 
   private ITransportConfig config;
 
-  private INegotiationContext negotiationContext;
-
   private long channelTimeout = DEFAULT_CHANNEL_TIMEOUT;
 
+  private transient ConnectorState connectorState = ConnectorState.DISCONNECTED;
+
   private transient InternalChannel[] channels = {};
 
   @ExcludeFromDump
   private transient Object channelsLock = new Object();
 
-  private transient ConnectorState connectorState = ConnectorState.DISCONNECTED;
-
   @ExcludeFromDump
   private transient CountDownLatch finishedConnecting;
 
@@ -78,7 +76,10 @@ public abstract class Connector extends Container<IChannel> implements InternalC
   private transient CountDownLatch finishedNegotiating;
 
   @ExcludeFromDump
-  private NegotiationException negotiationException;
+  private transient INegotiationContext negotiationContext;
+
+  @ExcludeFromDump
+  private transient NegotiationException negotiationException;
 
   public Connector()
   {
@@ -96,6 +97,7 @@ public abstract class Connector extends Container<IChannel> implements InternalC
 
   public synchronized void setConfig(ITransportConfig config)
   {
+    checkInactive();
     this.config = config;
   }
 
@@ -146,6 +148,7 @@ public abstract class Connector extends Container<IChannel> implements InternalC
 
   public void setUserID(String userID)
   {
+    checkState(getState() != ConnectorState.CONNECTED, "Connector is already connected");
     if (TRACER.isEnabled())
     {
       TRACER.format("Setting userID {0} for {1}", userID, this);
@@ -318,7 +321,7 @@ public abstract class Connector extends Container<IChannel> implements InternalC
       for (int i = 0; i < channels.length; i++)
       {
         IChannel channel = channels[i];
-        if (channel != null)
+        if (LifecycleUtil.isActive(channel))
         {
           result.add(channel);
         }