From c3961c2e4c55010c9a71e60f11e6bcb9d4c3e591 Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 29 Jun 2011 00:06:20 +0000 Subject: [PATCH] Fix what were originally typos Similar to https://issues.apache.org/bugzilla/show_bug.cgi?id=50648 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1140915 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/tribes/transport/ReceiverBase.java | 12 ++++++++++-- .../transport/bio/util/SingleRemoveSynchronizedAddLock.java | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/java/org/apache/catalina/tribes/transport/ReceiverBase.java b/java/org/apache/catalina/tribes/transport/ReceiverBase.java index 5be2921c9..8f9451931 100644 --- a/java/org/apache/catalina/tribes/transport/ReceiverBase.java +++ b/java/org/apache/catalina/tribes/transport/ReceiverBase.java @@ -227,7 +227,11 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R throw x; } portstart++; - try {Thread.sleep(25);}catch( InterruptedException ti){Thread.interrupted();} + try { + Thread.sleep(25); + } catch (InterruptedException ti) { + Thread.currentThread().interrupt(); + } retries = bind(socket,portstart,retries); } } @@ -258,7 +262,11 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R throw x; } portstart++; - try {Thread.sleep(25);}catch( InterruptedException ti){Thread.interrupted();} + try { + Thread.sleep(25); + } catch (InterruptedException ti) { + Thread.currentThread().interrupt(); + } retries = bindUdp(socket,portstart,retries); } } diff --git a/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java b/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java index b1dcbbc36..fe89b7b7f 100644 --- a/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java +++ b/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java @@ -184,7 +184,7 @@ public class SingleRemoveSynchronizedAddLock { try { wait(addWaitTimeout); } catch ( InterruptedException e ) { - Thread.interrupted(); + Thread.currentThread().interrupt(); } } while ( addLocked || removeLocked ); } @@ -206,7 +206,7 @@ public class SingleRemoveSynchronizedAddLock { try { wait(removeWaitTimeout); } catch ( InterruptedException e ) { - Thread.interrupted(); + Thread.currentThread().interrupt(); } } while ( ( addLocked || ! dataAvailable ) && removeEnabled ); remover=null; -- 2.11.0