Return-Path: Delivered-To: apmail-ws-sandesha-dev-archive@www.apache.org Received: (qmail 88560 invoked from network); 13 Sep 2007 16:45:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Sep 2007 16:45:46 -0000 Received: (qmail 42792 invoked by uid 500); 13 Sep 2007 16:45:39 -0000 Delivered-To: apmail-ws-sandesha-dev-archive@ws.apache.org Received: (qmail 42743 invoked by uid 500); 13 Sep 2007 16:45:39 -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 42730 invoked by uid 500); 13 Sep 2007 16:45:39 -0000 Delivered-To: apmail-ws-sandesha-cvs@ws.apache.org Received: (qmail 42726 invoked by uid 99); 13 Sep 2007 16:45:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Sep 2007 09:45:39 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Thu, 13 Sep 2007 16:45:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3C7BC1A9832; Thu, 13 Sep 2007 09:45:25 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r575365 - in /webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2: msgprocessors/SequenceProcessor.java storage/inmemory/InMemoryBeanMgr.java workers/Sender.java Date: Thu, 13 Sep 2007 16:45:24 -0000 To: sandesha-cvs@ws.apache.org From: mlovett@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070913164525.3C7BC1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mlovett Date: Thu Sep 13 09:45:23 2007 New Revision: 575365 URL: http://svn.apache.org/viewvc?rev=575365&view=rev Log: Ensure we free the transport as soon as possible Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryBeanMgr.java webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java?rev=575365&r1=575364&r2=575365&view=diff ============================================================================== --- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java (original) +++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/SequenceProcessor.java Thu Sep 13 09:45:23 2007 @@ -352,14 +352,14 @@ // If the MEP doesn't need the backchannel, and nor do we, we should signal it so that it // can close off as soon as possible. - result = InvocationResponse.ABORT; - RequestResponseTransport t = null; - t = (RequestResponseTransport) rmMsgCtx.getProperty(RequestResponseTransport.TRANSPORT_CONTROL); - - // Tell the transport that there will be no response message - if(t != null && RequestResponseTransportStatus.WAITING.equals(t.getStatus())) { - TransportUtils.setResponseWritten(msgCtx, false); - t.acknowledgeMessage(msgCtx); + if (backchannelFree) { + RequestResponseTransport t = null; + t = (RequestResponseTransport) rmMsgCtx.getProperty(RequestResponseTransport.TRANSPORT_CONTROL); + + if(t != null && RequestResponseTransportStatus.WAITING.equals(t.getStatus())) { + TransportUtils.setResponseWritten(msgCtx, false); + t.acknowledgeMessage(msgCtx); + } } } Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryBeanMgr.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryBeanMgr.java?rev=575365&r1=575364&r2=575365&view=diff ============================================================================== --- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryBeanMgr.java (original) +++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryBeanMgr.java Thu Sep 13 09:45:23 2007 @@ -128,8 +128,9 @@ SandeshaMessageKeys.nonUniqueResult, result.toString(), candidate.toString()); - log.error(message); - throw new SandeshaException (message); + SandeshaException e = new SandeshaException(message); + log.error(message, e); + throw e; } } } Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java?rev=575365&r1=575364&r2=575365&view=diff ============================================================================== --- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java (original) +++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java Thu Sep 13 09:45:23 2007 @@ -416,7 +416,7 @@ if (inMsg != null) t = (RequestResponseTransport) inMsg.getProperty(RequestResponseTransport.TRANSPORT_CONTROL); - if((t != null && !RequestResponseTransportStatus.WAITING.equals(t.getStatus()))) { + 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