From commits-return-64571-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org Wed Nov 10 21:23:49 2010 Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 81028 invoked from network); 10 Nov 2010 21:23:49 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 10 Nov 2010 21:23:49 -0000 Received: (qmail 49499 invoked by uid 500); 10 Nov 2010 21:24:21 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 49452 invoked by uid 500); 10 Nov 2010 21:24:21 -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 49445 invoked by uid 99); 10 Nov 2010 21:24:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Nov 2010 21:24:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Nov 2010 21:24:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E2E6223889C5; Wed, 10 Nov 2010 21:23:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1033718 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/modules/luni/src/main/java/java/net/DatagramSocket.java drlvm/ jdktools/ Date: Wed, 10 Nov 2010 21:23:06 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101110212306.E2E6223889C5@eris.apache.org> Author: hindessm Date: Wed Nov 10 21:23:06 2010 New Revision: 1033718 URL: http://svn.apache.org/viewvc?rev=1033718&view=rev Log: Merge change from /harmony/enhanced/java/trunk@1033407: r1033407 | tellison | 2010-11-10 10:24:46 +0000 (Wed, 10 Nov 2010) | 4 lines Fix for HARMONY-6367 ([classlib] Some Methods doesn't have security Permissions check as compared to SUN JDK) Add further check for accepting a datagram connection. Modified: harmony/enhanced/java/branches/java6/ (props changed) harmony/enhanced/java/branches/java6/classlib/ (props changed) harmony/enhanced/java/branches/java6/classlib/depends/libs/ (props changed) harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/net/DatagramSocket.java harmony/enhanced/java/branches/java6/drlvm/ (props changed) harmony/enhanced/java/branches/java6/jdktools/ (props changed) Propchange: harmony/enhanced/java/branches/java6/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 10 21:23:06 2010 @@ -1,4 +1,4 @@ /harmony/enhanced/java/branches/mrh:935751-941490 -/harmony/enhanced/java/trunk:929253-1029636,1029773,1029853,1030005 +/harmony/enhanced/java/trunk:929253-1029636,1029773,1029853,1030005,1033407 /harmony/enhanced/trunk:476395-929252 /incubator/harmony/enhanced/trunk:292550-476394 Propchange: harmony/enhanced/java/branches/java6/classlib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 10 21:23:06 2010 @@ -1,7 +1,7 @@ /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286 /harmony/enhanced/java/branches/mrh/classlib:935751-941490 -/harmony/enhanced/java/trunk/classlib:929253-1029636,1029773,1029853,1030005 +/harmony/enhanced/java/trunk/classlib:929253-1029636,1029773,1029853,1030005,1033407 /harmony/enhanced/trunk/classlib:476395-929252 /harmony/enhanced/trunk/working_classlib:476396-920147 /incubator/harmony/enhanced/trunk/classlib:292550-476394 Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 10 21:23:06 2010 @@ -1,4 +1,4 @@ /harmony/enhanced/classlib/trunk/depends/libs:544451-926091 -/harmony/enhanced/java/trunk/classlib/depends/libs:929253-1029636,1029773,1029853,1030005 +/harmony/enhanced/java/trunk/classlib/depends/libs:929253-1029636,1029773,1029853,1030005,1033407 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394 Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/net/DatagramSocket.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/net/DatagramSocket.java?rev=1033718&r1=1033717&r2=1033718&view=diff ============================================================================== --- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/net/DatagramSocket.java (original) +++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/java/net/DatagramSocket.java Wed Nov 10 21:23:06 2010 @@ -163,6 +163,7 @@ public class DatagramSocket { security.checkMulticast(anAddress); } else { security.checkConnect(anAddress.getHostName(), aPort); + security.checkAccept(anAddress.getHostName(), aPort); } } Propchange: harmony/enhanced/java/branches/java6/drlvm/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 10 21:23:06 2010 @@ -1,5 +1,5 @@ /harmony/enhanced/java/branches/mrh/drlvm:935751-941490 -/harmony/enhanced/java/trunk/drlvm:929253-1029636,1029773,1029853,1030005 +/harmony/enhanced/java/trunk/drlvm:929253-1029636,1029773,1029853,1030005,1033407 /harmony/enhanced/trunk/drlvm:476395-929252 /harmony/enhanced/trunk/working_vm:476396-920147 /incubator/harmony/enhanced/trunk/drlvm:292550-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 10 21:23:06 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools:929253-1029636,1029773,1029853,1030005 +/harmony/enhanced/java/trunk/jdktools:929253-1029636,1029773,1029853,1030005,1033407 /harmony/enhanced/jdktools/trunk:630107-925933 /harmony/enhanced/trunk/jdktools:476395-929252 /harmony/enhanced/trunk/working_jdktools:476396-920147