You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2009/08/17 21:31:35 UTC
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
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));