Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 68234 invoked from network); 27 Jul 2006 12:26:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 27 Jul 2006 12:26:17 -0000 Received: (qmail 9361 invoked by uid 500); 27 Jul 2006 12:26:16 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 9326 invoked by uid 500); 27 Jul 2006 12:26:16 -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 9315 invoked by uid 99); 27 Jul 2006 12:26:16 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Jul 2006 05:26:16 -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; Thu, 27 Jul 2006 05:26:15 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id C337B1A981A; Thu, 27 Jul 2006 05:25:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r426042 - /incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java Date: Thu, 27 Jul 2006 12:25:55 -0000 To: harmony-commits@incubator.apache.org From: pyang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060727122555.C337B1A981A@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: pyang Date: Thu Jul 27 05:25:54 2006 New Revision: 426042 URL: http://svn.apache.org/viewvc?rev=426042&view=rev Log: Second patch for HARMONY-961 ([classlib][nio]java.nio.channels.spi.SelectorProvider.inheritedChannel must be implemented) Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java?rev=426042&r1=426041&r2=426042&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java Thu Jul 27 05:25:54 2006 @@ -28,6 +28,7 @@ import java.security.PrivilegedAction; import java.util.Enumeration; +import org.apache.harmony.luni.platform.Platform; import org.apache.harmony.nio.internal.SelectorProviderImpl; /** @@ -51,6 +52,8 @@ private static final String PROVIDER_IN_JAR_RESOURCE = "META-INF/services/java.nio.channels.spi.SelectorProvider"; //$NON-NLS-1$ private static SelectorProvider provider = null; + + private static Channel inheritedChannel; /** * Constructor for this class. @@ -237,12 +240,9 @@ * RuntimePermission("selectorProvider"). */ public Channel inheritedChannel() throws IOException { - return null; -// FIXME waiting for VM support -// if (null == inheritedChannel) { -// inheritedChannel = OSComponentFactory.getNetworkSystem() -// .inheritedChannel(); -// } -// return inheritedChannel; + if (null == inheritedChannel) { + inheritedChannel = Platform.getNetworkSystem().inheritedChannel(); + } + return inheritedChannel; } }