From 7ffe0e63e7ad0e8bc06ce2f8bff52c3b65fc255d Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 26 Jan 2011 16:53:23 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1063791 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/tribes/group/RpcChannel.java | 3 +-- webapps/docs/changelog.xml | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/tribes/group/RpcChannel.java b/java/org/apache/catalina/tribes/group/RpcChannel.java index 6fddeb151..04ad44074 100644 --- a/java/org/apache/catalina/tribes/group/RpcChannel.java +++ b/java/org/apache/catalina/tribes/group/RpcChannel.java @@ -95,8 +95,7 @@ public class RpcChannel implements ChannelListener{ if ( rpcOptions != NO_REPLY ) collector.wait(timeout); } } catch ( InterruptedException ix ) { - Thread.interrupted(); - //throw new ChannelException(ix); + Thread.currentThread().interrupt(); }finally { responseMap.remove(key); } diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 2f679019a..1652a6f3c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -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) + -- 2.11.0