Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 40656 invoked from network); 5 Jan 2007 10:10:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Jan 2007 10:10:57 -0000 Received: (qmail 22283 invoked by uid 500); 5 Jan 2007 10:11:04 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 22265 invoked by uid 500); 5 Jan 2007 10:11:04 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 22254 invoked by uid 99); 5 Jan 2007 10:11:04 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jan 2007 02:11:04 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jan 2007 02:10:56 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 8C93B1A981D; Fri, 5 Jan 2007 02:09:59 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r492957 - in /harmony/enhanced/classlib/trunk/modules/luni/src: main/java/java/net/DatagramSocket.java main/java/org/apache/harmony/luni/util/ExternalMessages.properties test/java/tests/api/java/net/DatagramSocketTest.java Date: Fri, 05 Jan 2007 10:09:58 -0000 To: commits@harmony.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070105100959.8C93B1A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tellison Date: Fri Jan 5 02:09:57 2007 New Revision: 492957 URL: http://svn.apache.org/viewvc?view=rev&rev=492957 Log: Apply slightly modified patch for HARMONY-2938 ([classlib][luni]no NPE was thrown when send a DatagramPacket with no dest addresss) Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramSocket.java harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramSocket.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramSocket.java?view=diff&rev=492957&r1=492956&r2=492957 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramSocket.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramSocket.java Fri Jan 5 02:09:57 2007 @@ -406,10 +406,14 @@ pack.setPort(port); } } else { - // not connected so the target address cannot be null - if (packAddr == null) { - return; - } + // not connected so the target address is not allowed to be null + if (packAddr == null) { + if (pack.port == -1) { + // KA019 Destination address is null + throw new NullPointerException(Msg.getString("KA019")); //$NON-NLS-1$ + } + return; + } SecurityManager security = System.getSecurityManager(); if (security != null) { if (packAddr.isMulticastAddress()) Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties?view=diff&rev=492957&r1=492956&r2=492957 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties Fri Jan 5 02:09:57 2007 @@ -311,3 +311,4 @@ KA016=Received authentication challenge is null KA017=Received HTTP_PROXY_AUTH (407) code while not using proxy KA018=Received authentication challenge is null +KA019=Destination address is null Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java?view=diff&rev=492957&r1=492956&r2=492957 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java Fri Jan 5 02:09:57 2007 @@ -961,6 +961,18 @@ InetSocketAddress sa = InetSocketAddress.createUnresolved("localhost", 0); //no exception expected for next line new testDatagramSocket(new testDatagramSocketImpl()).send(new DatagramPacket(new byte[272], 3, sa)); + + // Regression test for Harmony-2938 + InetAddress i = InetAddress.getByName("127.0.0.1"); + DatagramSocket d = new DatagramSocket(80, i); + try { + d.send(new DatagramPacket(new byte[] { 1 }, 1)); + fail("should throw NPE."); + } catch (NullPointerException e) { + // expected; + } finally { + d.close(); + } } /**