Author: ron.sigal(a)jboss.com Date: 2009-09-14 19:31:59 -0400 (Mon, 14 Sep 2009) New Revision: 5477 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java Log: JBREM-1146: Before checking generalized IOExceptions, check that exception message is not null. 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 2009-09-14 23:29:42 UTC (rev 5476) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2009-09-14 23:31:59 UTC (rev 5477) @@ -585,6 +585,7 @@ for (; retryCount < numberOfCallRetries; retryCount++) { + if (trace) log.trace(this + " retryCount: " + retryCount); // timeLeft < 0 will indicate that there is no per invocation timeout. int timeLeft = -1; if (0 < tempTimeout) @@ -619,7 +620,8 @@ semaphore.release(); if (trace) log.trace(this + " released semaphore: " + semaphore.permits()); log.debug(this + " got " + e + ": " + e.getMessage()); - if (retryCount < numberOfCallRetries - 1 && isGeneralizeSocketException() && RETRIABLE_ERROR_MESSAGE.matcher(e.getMessage()).matches()) + if (retryCount < numberOfCallRetries - 1 && isGeneralizeSocketException() + && e.getMessage() != null && RETRIABLE_ERROR_MESSAGE.matcher(e.getMessage()).matches()) { continue; } @@ -712,7 +714,7 @@ } catch (IOException e) { - if (isGeneralizeSocketException() && RETRIABLE_ERROR_MESSAGE.matcher(e.getMessage()).matches()) + if (isGeneralizeSocketException() && e.getMessage() != null && RETRIABLE_ERROR_MESSAGE.matcher(e.getMessage()).matches()) { handleSocketException(e, socketWrapper, semaphore, retryCount); sockEx = new SocketException(e.getMessage());