From 5b215c911a54248a06b7e324b5c85cbefed7609a Mon Sep 17 00:00:00 2001 From: Thomas Neidhart Date: Fri, 27 Jun 2014 09:36:27 +0000 Subject: [PATCH] [LOGGING-156] Fix SecurityAllowedTestCase when run with OpenJDK 1.7. Thanks to Mikolaj Izdebski. git-svn-id: https://svn.apache.org/repos/asf/commons/proper/logging/trunk@1606000 13f79535-47bb-0310-9956-ffa450edef68 --- src/changes/changes.xml | 3 +++ .../commons/logging/security/MockSecurityManager.java | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index f601e2a..e1a586c 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -44,6 +44,9 @@ The type attribute can be add,update,fix,remove. + + Fix SecurityAllowedTestCase when executed with OpenJDK 1.7 due to an additional required RuntimePermission. + Fix javadoc to comply with javadoc tool from jdk 1.8. diff --git a/src/test/java/org/apache/commons/logging/security/MockSecurityManager.java b/src/test/java/org/apache/commons/logging/security/MockSecurityManager.java index 462c26e..0d9b4de 100644 --- a/src/test/java/org/apache/commons/logging/security/MockSecurityManager.java +++ b/src/test/java/org/apache/commons/logging/security/MockSecurityManager.java @@ -95,6 +95,13 @@ public class MockSecurityManager extends SecurityManager { return; } + if (cname.equals("java.util.logging.Level") && stack[i].getMethodName().equals("getLocalizedLevelName")) { + // LOGGING-156: OpenJDK 1.7 JULI code (java.util.logging.Level#getLocalizedLevelName) + // calls ResourceBundle#getBundle() without using AccessController#doPrivileged() + // requiring RuntimePermission: "accessClassInPackage.sun.util.logging.resources" + return; + } + if (cname.equals("java.security.AccessController")) { // Presumably method name equals "doPrivileged" //