From harmony-commits-return-6347-apmail-incubator-harmony-commits-archive=incubator.apache.org@incubator.apache.org Mon Jul 03 11:10:16 2006 Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 59588 invoked from network); 3 Jul 2006 11:10:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Jul 2006 11:10:16 -0000 Received: (qmail 14527 invoked by uid 500); 3 Jul 2006 11:10:16 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 14484 invoked by uid 500); 3 Jul 2006 11:10:15 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 14473 invoked by uid 99); 3 Jul 2006 11:10:15 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jul 2006 04:10:15 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jul 2006 04:10:15 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 0B2821A983A; Mon, 3 Jul 2006 04:09:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r418742 - /incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java Date: Mon, 03 Jul 2006 11:09:54 -0000 To: harmony-commits@incubator.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060703110955.0B2821A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: tellison Date: Mon Jul 3 04:09:54 2006 New Revision: 418742 URL: http://svn.apache.org/viewvc?rev=418742&view=rev Log: Apply patch HARMONY-726 ([classlib][nio] Remove unnecessary check for AsynchronousCloseException in ServerSocketChannelImpl.) Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java?rev=418742&r1=418741&r2=418742&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java Mon Jul 3 04:09:54 2006 @@ -16,14 +16,12 @@ import java.io.FileDescriptor; import java.io.IOException; -import java.net.BindException; import java.net.ServerSocket; import java.net.Socket; import java.net.SocketAddress; import java.net.SocketException; import java.net.SocketImpl; import java.net.SocketTimeoutException; -import java.nio.channels.AsynchronousCloseException; import java.nio.channels.ClosedChannelException; import java.nio.channels.NotYetBoundException; import java.nio.channels.SelectableChannel; @@ -56,9 +54,6 @@ // status closed. private static final int SERVER_STATUS_CLOSED = 1; - // error message, for native dependent. - private static final String ERRMSG_ASYNCHRONOUS = "The call was cancelled"; //$NON-NLS-1$ - // ------------------------------------------------------------------- // Instance variables // ------------------------------------------------------------------- @@ -157,11 +152,6 @@ } while (isBlocking); } } - } catch (BindException e) { - // FIXME improve native code. - if (ERRMSG_ASYNCHRONOUS.equals(e.getMessage())) { - throw new AsynchronousCloseException(); - } } finally { end(socketGot.isConnected()); } @@ -257,10 +247,6 @@ aSocket.getPort()); } connectOK = true; - } catch (SocketException e) { - if (ERRMSG_ASYNCHRONOUS.equals(e.getMessage())) { - throw new AsynchronousCloseException(); - } } finally { if (!connectOK) { aSocket.close();