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

diff --git a/java/org/apache/catalina/tribes/group/RpcChannel.java b/java/org/apache/catalina/tribes/group/RpcChannel.java
index 6fddeb1..04ad440 100644 (file)
--- 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 2f67901..1652a6f 100644 (file)
--- 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)
       </fix>
+      <fix>
+        <bug>50648</bug>: Correctly set the interrupt status if a thread using
+        <code>RpcChannel</code> is interrupted waiting for a message reply.
+        Based on a patch by Olivier Costet. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Web applications">