From ff61dda0ea8e305cd5b8e4451f08db2708f19137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Garcia?= Date: Sun, 23 Feb 2014 15:23:00 -0300 Subject: [PATCH] PrivilegedAction can executed with generics --- .../java/org/apache/commons/logging/impl/SimpleLog.java | 4 ++-- slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SimpleLog.java b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SimpleLog.java index 89621be94..765bca374 100644 --- a/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SimpleLog.java +++ b/jcl-over-slf4j/src/main/java/org/apache/commons/logging/impl/SimpleLog.java @@ -674,8 +674,8 @@ private static ClassLoader getContextClassLoader() { } private static InputStream getResourceAsStream(final String name) { - return (InputStream) AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { + return AccessController.doPrivileged(new PrivilegedAction() { + public InputStream run() { ClassLoader threadCL = getContextClassLoader(); if (threadCL != null) { diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java index 6a70ec5a2..8ad22033a 100644 --- a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java +++ b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java @@ -233,9 +233,9 @@ else if ("System.out".equalsIgnoreCase(logFile)) { private static void loadProperties() { // Add props from the resource simplelogger.properties - InputStream in = (InputStream) AccessController.doPrivileged( - new PrivilegedAction() { - public Object run() { + InputStream in = AccessController.doPrivileged( + new PrivilegedAction() { + public InputStream run() { ClassLoader threadCL = Thread.currentThread().getContextClassLoader(); if (threadCL != null) { return threadCL.getResourceAsStream(CONFIGURATION_FILE);