Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 19437 invoked from network); 20 Jun 2006 14:30:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 Jun 2006 14:30:42 -0000 Received: (qmail 8028 invoked by uid 500); 20 Jun 2006 14:30:42 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 7998 invoked by uid 500); 20 Jun 2006 14:30:42 -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 7987 invoked by uid 99); 20 Jun 2006 14:30:42 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Jun 2006 07:30:42 -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; Tue, 20 Jun 2006 07:30:40 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 7D5301A983A; Tue, 20 Jun 2006 07:30:20 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r415654 - in /incubator/harmony/enhanced/classlib/trunk/modules/nio/src: main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java test/java/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java Date: Tue, 20 Jun 2006 14:30:20 -0000 To: harmony-commits@incubator.apache.org From: gharley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060620143020.7D5301A983A@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: gharley Date: Tue Jun 20 07:30:19 2006 New Revision: 415654 URL: http://svn.apache.org/viewvc?rev=415654&view=rev Log: HARMONY-616 : Remove one FIXME from "receive(ByteBuffer)" method of org.apache.harmony.nio.internal.DatagramChannelImpl Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java?rev=415654&r1=415653&r2=415654&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java Tue Jun 20 07:30:19 2006 @@ -229,17 +229,6 @@ checkOpen(); if (!isBound) { - // FIXME RI seems does not perform as datagram socket - // SecurityManager security = System.getSecurityManager(); - // if (security != null) - // security.checkListen(0); - // final byte[] any = new byte[] { 0, 0, 0, 0 }; - // try { - // networkSystem.bind(fd, 0, InetAddress.getByAddress(any)); - // } catch (UnknownHostException e) { - // // impossible,do nothing - // } - // isBound = true; return null; } @@ -729,4 +718,4 @@ super.disconnect(); } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java?rev=415654&r1=415653&r2=415654&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java Tue Jun 20 07:30:19 2006 @@ -1354,8 +1354,9 @@ // not bound sendByChannel("some normal string in testReceiveSend_Normal", localAddr2); - ByteBuffer buf = ByteBuffer.wrap(new byte[CAPACITY_NORMAL]); - assertNull((InetSocketAddress) this.channel1.receive(buf)); + ByteBuffer buf = ByteBuffer.allocate(CAPACITY_NORMAL); + assertNull(channel1.receive(buf)); + assertFalse(channel1.socket().isBound()); } public void testReceiveSend_NonBlock_NotBound() throws Exception {