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 6E46C11342 for ; Tue, 13 May 2014 22:52:11 +0000 (UTC) Received: (qmail 61488 invoked by uid 500); 10 May 2014 22:53:54 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 49165 invoked by uid 500); 10 May 2014 22:53:01 -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 34802 invoked by uid 99); 10 May 2014 22:51:58 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 May 2014 22:51:58 +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; Thu, 08 May 2014 19:23:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9EA952388980 for ; Thu, 8 May 2014 19:23:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1593391 - /tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Date: Thu, 08 May 2014 19:23:22 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140508192322.9EA952388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Thu May 8 19:23:22 2014 New Revision: 1593391 URL: http://svn.apache.org/r1593391 Log: Work around intermittent unit test failures on OSX. Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1593391&r1=1593390&r2=1593391&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original) +++ tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Thu May 8 19:23:22 2014 @@ -133,7 +133,7 @@ public final class TesterSupport { // Disabled by default in 1.1.20 windows binary (2010-07-27) return false; } - if (protocol.contains("NioProtocol")) { + if (protocol.contains("NioProtocol") || protocol.contains("Nio2Protocol")) { // Doesn't work on all platforms - see BZ 56448. return false; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org