Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 13863 invoked from network); 26 Jan 2011 17:27:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Jan 2011 17:27:59 -0000 Received: (qmail 99115 invoked by uid 500); 26 Jan 2011 17:27:58 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 97908 invoked by uid 500); 26 Jan 2011 17:27:55 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 97031 invoked by uid 99); 26 Jan 2011 17:27:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jan 2011 17:27:54 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [72.22.94.67] (HELO virtual.halosg.com) (72.22.94.67) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Jan 2011 17:27:45 +0000 Received: (qmail 27723 invoked from network); 26 Jan 2011 11:27:25 -0600 Received: from unknown (HELO ?10.16.17.27?) (65.115.85.245) by halosg.com with (DHE-RSA-AES256-SHA encrypted) SMTP; 26 Jan 2011 11:27:24 -0600 Message-ID: <4D4059F5.6010609@hanik.com> Date: Wed, 26 Jan 2011 10:29:25 -0700 From: Filip Hanik - Dev Lists User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100330 Fedora/3.0.4-1.fc11 Lightning/1.0b2pre Thunderbird/3.0.4 MIME-Version: 1.0 To: Tomcat Developers List Subject: Re: svn commit: r1063791 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/RpcChannel.java webapps/docs/changelog.xml References: <20110126165323.CB8762388903@eris.apache.org> In-Reply-To: <20110126165323.CB8762388903@eris.apache.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org hmm, it should probably throw the commented out channel exception instead of simply bailing out with the flag set. After all the timeout has not been reached, so the caller should not be tricked into thinking that it has, since no one ever checks the interrupted flag Filip On 01/26/2011 09:53 AM, markt@apache.org wrote: > Author: markt > Date: Wed Jan 26 16:53:23 2011 > New Revision: 1063791 > > URL: http://svn.apache.org/viewvc?rev=1063791&view=rev > Log: > Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50648 > Correctly set the interrupt status if a thread using RpcChannel is interrupted waiting for a message reply. > Based on a patch by Olivier Costet. > > Modified: > tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java > tomcat/trunk/webapps/docs/changelog.xml > > Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java > URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java?rev=1063791&r1=1063790&r2=1063791&view=diff > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java (original) > +++ tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java Wed Jan 26 16:53:23 2011 > @@ -95,8 +95,7 @@ public class RpcChannel implements Chann > if ( rpcOptions != NO_REPLY ) collector.wait(timeout); > } > } catch ( InterruptedException ix ) { > - Thread.interrupted(); > - //throw new ChannelException(ix); > + Thread.currentThread().interrupt(); > }finally { > responseMap.remove(key); > } > > Modified: tomcat/trunk/webapps/docs/changelog.xml > URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1063791&r1=1063790&r2=1063791&view=diff > ============================================================================== > --- tomcat/trunk/webapps/docs/changelog.xml (original) > +++ tomcat/trunk/webapps/docs/changelog.xml Wed Jan 26 16:53:23 2011 > @@ -158,6 +158,11 @@ > Be consistent with locks on sessionCreationTiming, > sessionExpirationTiming in DeltaManager.resetStatistics(). (kkolinko) > > + > +50648: Correctly set the interrupt status if a thread using > +RpcChannel is interrupted waiting for a message reply. > + Based on a patch by Olivier Costet. (markt) > + > > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org > For additional commands, e-mail: dev-help@tomcat.apache.org > > > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org