Return-Path: Delivered-To: apmail-ws-sandesha-dev-archive@www.apache.org Received: (qmail 88343 invoked from network); 12 Jun 2007 11:28:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Jun 2007 11:28:49 -0000 Received: (qmail 81992 invoked by uid 500); 12 Jun 2007 11:28:52 -0000 Delivered-To: apmail-ws-sandesha-dev-archive@ws.apache.org Received: (qmail 81909 invoked by uid 500); 12 Jun 2007 11:28:51 -0000 Mailing-List: contact sandesha-dev-help@ws.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list sandesha-dev@ws.apache.org Received: (qmail 81898 invoked by uid 500); 12 Jun 2007 11:28:51 -0000 Delivered-To: apmail-ws-sandesha-cvs@ws.apache.org Received: (qmail 81895 invoked by uid 99); 12 Jun 2007 11:28:51 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jun 2007 04:28:51 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jun 2007 04:28:47 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 766621A981A; Tue, 12 Jun 2007 04:28:27 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r546456 - /webservices/sandesha/branches/sandesha2/java/1_2/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java Date: Tue, 12 Jun 2007 11:28:27 -0000 To: sandesha-cvs@ws.apache.org From: gatfora@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070612112827.766621A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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