[jboss-remoting-commits] JBoss Remoting SVN: r6447 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket.

[jboss-remoting-commits at lists.jboss.org]

Author: ron.sigal at jboss.com
Date: 2012-07-17 14:19:00 -0400 (Tue, 17 Jul 2012)
New Revision: 6447

Modified:
   remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
Log:
JBREM-1305: transport() catches IllegalStateException from getConnection() and doesn't release a semaphore.

Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java	2012-07-17 03:52:00 UTC (rev 6446)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java	2012-07-17 18:19:00 UTC (rev 6447)
@@ -581,7 +581,7 @@
       }
 
       int retryCount = 0;
-      SocketException sockEx = null;
+      Exception sockEx = null;
 
       for (; retryCount < numberOfCallRetries; retryCount++)
       {
@@ -601,6 +601,13 @@
          {
             socketWrapper = getConnection(marshaller, unmarshaller, timeLeft);
          }
+         catch (IllegalStateException e)
+         {
+            sockEx =  new CannotConnectException(
+                  "Can not get connection to server. All connections for " +
+                  locator + " are in use", e);
+            continue;
+         }
          catch (SocketException e)
          {
             semaphore.release();