Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 53400 invoked from network); 24 Mar 2009 20:59:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Mar 2009 20:59:25 -0000 Received: (qmail 91303 invoked by uid 500); 24 Mar 2009 20:59:25 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 91276 invoked by uid 500); 24 Mar 2009 20:59:25 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 91267 invoked by uid 99); 24 Mar 2009 20:59:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Mar 2009 20:59:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Mar 2009 20:59:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 57D232388AAF; Tue, 24 Mar 2009 20:59:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r758017 - /qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java Date: Tue, 24 Mar 2009 20:59:04 -0000 To: commits@qpid.apache.org From: rajith@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090324205904.57D232388AAF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajith Date: Tue Mar 24 20:59:03 2009 New Revision: 758017 URL: http://svn.apache.org/viewvc?rev=758017&view=rev Log: This is a fix for QPID-1773 Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java?rev=758017&r1=758016&r2=758017&view=diff ============================================================================== --- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java (original) +++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java Tue Mar 24 20:59:03 2009 @@ -559,7 +559,7 @@ if (isFull(next)) { Waiter w = new Waiter(commands, timeout); - while (w.hasTime() && isFull(next)) + while (w.hasTime() && isFull(next) && state != CLOSED) { if (state == OPEN || state == RESUMING) { @@ -585,6 +585,19 @@ } } + if (state == CLOSED) + { + ExecutionException exc = getException(); + if (exc != null) + { + throw new SessionException(exc); + } + else + { + throw new SessionClosedException(); + } + } + if (isFull(next)) { throw new SessionException("timed out waiting for completion"); --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscribe@qpid.apache.org