Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 75948 invoked from network); 17 Aug 2009 19:31:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Aug 2009 19:31:51 -0000 Received: (qmail 48207 invoked by uid 500); 17 Aug 2009 19:31:57 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 48178 invoked by uid 500); 17 Aug 2009 19:31:57 -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 48163 invoked by uid 99); 17 Aug 2009 19:31:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Aug 2009 19:31:57 +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; Mon, 17 Aug 2009 19:31:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 98B6823888A0; Mon, 17 Aug 2009 19:31:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r805109 - in /harmony/enhanced/classlib/branches/java6/modules/security/src: main/java/common/java/security/BasicPermission.java test/api/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java Date: Mon, 17 Aug 2009 19:31:35 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090817193135.98B6823888A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hindessm Date: Mon Aug 17 19:31:35 2009 New Revision: 805109 URL: http://svn.apache.org/viewvc?rev=805109&view=rev Log: Applied patch from "[#HARMONY-6233] [java6][classlib][security] Fix incorrect behavior of implies method of BasicPermission". Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/BasicPermission.java harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/BasicPermission.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/BasicPermission.java?rev=805109&r1=805108&r2=805109&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/BasicPermission.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/java/security/BasicPermission.java Mon Aug 17 19:31:35 2009 @@ -153,7 +153,8 @@ if (this instanceof RuntimePermission) { if (thatName.equals("exitVM")) { thatName = "exitVM.*"; - } else if (name.equals("exitVM")) { + } + if (name.equals("exitVM")) { name = "exitVM.*"; } } Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java?rev=805109&r1=805108&r2=805109&view=diff ============================================================================== --- harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java (original) +++ harmony/enhanced/classlib/branches/java6/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java Mon Aug 17 19:31:35 2009 @@ -128,6 +128,7 @@ Permission permission_exitVM_0 = new RuntimePermission("exitVM.0"); Permission permission_exitVM_a = new RuntimePermission("exitVM.a"); assertTrue(permission_exitVM.implies(permission_exitVM_ALL)); + assertTrue(permission_exitVM.implies(permission_exitVM)); assertTrue(permission_exitVM.implies(permission_exitVM_0)); assertTrue(permission_exitVM.implies(permission_exitVM_a)); assertTrue(permission_exitVM_ALL.implies(permission_exitVM));