Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DE5376029 for ; Wed, 29 Jun 2011 00:06:43 +0000 (UTC) Received: (qmail 19571 invoked by uid 500); 29 Jun 2011 00:06:43 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 19510 invoked by uid 500); 29 Jun 2011 00:06:42 -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 19501 invoked by uid 99); 29 Jun 2011 00:06:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Jun 2011 00:06:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 29 Jun 2011 00:06:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 114B523888C2 for ; Wed, 29 Jun 2011 00:06:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1140915 - in /tomcat/trunk/java/org/apache/catalina/tribes/transport: ReceiverBase.java bio/util/SingleRemoveSynchronizedAddLock.java Date: Wed, 29 Jun 2011 00:06:21 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110629000621.114B523888C2@eris.apache.org> Author: markt Date: Wed Jun 29 00:06:20 2011 New Revision: 1140915 URL: http://svn.apache.org/viewvc?rev=1140915&view=rev Log: Fix what were originally typos Similar to https://issues.apache.org/bugzilla/show_bug.cgi?id=50648 Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java?rev=1140915&r1=1140914&r2=1140915&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java Wed Jun 29 00:06:20 2011 @@ -227,7 +227,11 @@ public abstract class ReceiverBase imple 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 imple 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); } } Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java?rev=1140915&r1=1140914&r2=1140915&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java Wed Jun 29 00:06:20 2011 @@ -184,7 +184,7 @@ public class SingleRemoveSynchronizedAdd try { wait(addWaitTimeout); } catch ( InterruptedException e ) { - Thread.interrupted(); + Thread.currentThread().interrupt(); } } while ( addLocked || removeLocked ); } @@ -206,7 +206,7 @@ public class SingleRemoveSynchronizedAdd try { wait(removeWaitTimeout); } catch ( InterruptedException e ) { - Thread.interrupted(); + Thread.currentThread().interrupt(); } } while ( ( addLocked || ! dataAvailable ) && removeEnabled ); remover=null; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org