Author: gatfora Date: Tue Jun 12 04:28:25 2007 New Revision: 546456 URL: http://svn.apache.org/viewvc?view=rev&rev=546456 Log: Fix the Sender NPE in the Sandesha2 1.2 branch Modified: webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java Modified: webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java?view=diff&rev=546456&r1=546455&r2=546456 ============================================================================== --- webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java (original) +++ webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java Tue Jun 12 04:28:25 2007 @@ -397,7 +397,7 @@ if (inMsg != null) t = (RequestResponseTransport) inMsg.getProperty(RequestResponseTransport.TRANSPORT_CONTROL); - if((t != null || !t.getStatus().equals(RequestResponseTransportStatus.WAITING))) { + if((t != null && !RequestResponseTransportStatus.WAITING.equals(t.getStatus()))) { if(log.isWarnEnabled()) { String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.freeingTransport); log.warn(message); --------------------------------------------------------------------- To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org For additional commands, e-mail: sandesha-dev-help@ws.apache.org