Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 91205 invoked from network); 19 Jul 2006 09:31:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 Jul 2006 09:31:30 -0000 Received: (qmail 27686 invoked by uid 500); 19 Jul 2006 09:31:27 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 27658 invoked by uid 500); 19 Jul 2006 09:31:27 -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 27641 invoked by uid 99); 19 Jul 2006 09:31:27 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Jul 2006 02:31:27 -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; Wed, 19 Jul 2006 02:31:26 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A16F41A981A; Wed, 19 Jul 2006 02:31:06 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r423413 - in /incubator/harmony/enhanced/classlib/trunk/modules/nio/src: main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java test/java/common/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java Date: Wed, 19 Jul 2006 09:31:05 -0000 To: harmony-commits@incubator.apache.org From: pyang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060719093106.A16F41A981A@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: Wed Jul 19 02:31:03 2006 New Revision: 423413 URL: http://svn.apache.org/viewvc?rev=423413&view=rev Log: Fix for HARMONY-913([classlib][nio] o.a.h.nio.DatagramChannelImpl.send(ByteBuffer,SocketAddress) throws wrong exception) 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/common/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=423413&r1=423412&r2=423413&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 Wed Jul 19 02:31:03 2006 @@ -285,10 +285,10 @@ */ public int send(ByteBuffer source, SocketAddress address) throws IOException { - // must open - checkOpen(); // must not null checkNotNull(source); + // must open + checkOpen(); // transfer address InetSocketAddress isa = (InetSocketAddress) address; Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/common/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/common/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java?rev=423413&r1=423412&r2=423413&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/common/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/common/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java Wed Jul 19 02:31:03 2006 @@ -2483,6 +2483,39 @@ } } + /** + * @tests DatagramChannel#send(ByteBuffer, SocketAddress) + */ + public void test_send_LByteBuffer_LSocketAddress_closed() throws IOException{ + // regression test for Harmony-913 + channel1.close(); + ByteBuffer buf = ByteBuffer.allocate(CAPACITY_NORMAL); + try { + channel1.send(buf, localAddr1); + fail("Should throw ClosedChannelException"); + } catch (ClosedChannelException e) { + //pass + } + try { + channel1.send(null,localAddr1); + fail("Should throw NullPointerException"); + } catch (NullPointerException e) { + //pass + } + try { + channel1.send(buf, null); + fail("Should throw ClosedChannelException"); + } catch (ClosedChannelException e) { + //pass + } + try { + channel1.send(null, null); + fail("Should throw NullPointerException"); + } catch (NullPointerException e) { + //pass + } + } + // ------------------------------------------------------------------- // Mock class for security test. // -------------------------------------------------------------------