there is no connection thread, so don't wait for the channel

jvdvegt · Oct 23, 2012 · ae70ee3 · ae70ee3
1 parent a3072fb
commit ae70ee3
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/protocol/src/main/java/org/jboss/as/protocol/mgmt/FutureManagementChannel.java b/protocol/src/main/java/org/jboss/as/protocol/mgmt/FutureManagementChannel.java
@@ -168,13 +168,18 @@ static class Establishing extends FutureManagementChannel {
 
         @Override
         public Channel getChannel() throws IOException {
-            final Channel channel = super.getChannel();
+            Channel channel = super.getChannel();
             if(channel != null) {
                 return channel;
             }
             // Try to connect and wait for the channel
             connectionManager.connect();
-            return awaitChannel();
+            // In case connect did not succeed the next getChannel() call needs to try to reconnect
+            channel = super.getChannel();
+            if(channel == null) {
+                throw ProtocolMessages.MESSAGES.channelClosed();
+            }
+            return channel;
         }
 
         @Override