Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 92E0ADBE4 for ; Sat, 6 Oct 2012 18:45:07 +0000 (UTC) Received: (qmail 98187 invoked by uid 500); 6 Oct 2012 18:45:07 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 98163 invoked by uid 500); 6 Oct 2012 18:45:07 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 98156 invoked by uid 99); 6 Oct 2012 18:45:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Oct 2012 18:45:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Sat, 06 Oct 2012 18:45:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 07517238896F; Sat, 6 Oct 2012 18:44:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1395147 - /logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java Date: Sat, 06 Oct 2012 18:44:22 -0000 To: commits@logging.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121006184423.07517238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Sat Oct 6 18:44:22 2012 New Revision: 1395147 URL: http://svn.apache.org/viewvc?rev=1395147&view=rev Log: Fix generics warnings. Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java?rev=1395147&r1=1395146&r2=1395147&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/LogManager.java Sat Oct 6 18:44:22 2012 @@ -62,7 +62,7 @@ public class LogManager { ClassLoader cl = findClassLoader(); List factories = new ArrayList(); - Enumeration enumResources = null; + Enumeration enumResources = null; try { enumResources = cl.getResources(LOGGER_RESOURCE); } catch (IOException e) { @@ -72,7 +72,7 @@ public class LogManager { if (enumResources != null) { while (enumResources.hasMoreElements()) { Properties props = new Properties(); - URL url = (URL) enumResources.nextElement(); + URL url = enumResources.nextElement(); try { props.loadFromXML(url.openStream()); } catch (IOException ioe) { @@ -84,7 +84,7 @@ public class LogManager { String className = props.getProperty(LOGGER_CONTEXT_FACTORY); if (className != null) { try { - Class clazz = cl.loadClass(className); + Class clazz = cl.loadClass(className); if (LoggerContextFactory.class.isAssignableFrom(clazz)) { factories.add((LoggerContextFactory) clazz.newInstance()); } else { @@ -134,7 +134,7 @@ public class LogManager { * @param clazz The Class whose name should be used as the Logger name. * @return The Logger. */ - public static Logger getLogger(Class clazz) { + public static Logger getLogger(Class clazz) { return factory.getContext(LogManager.class.getName(), null, false).getLogger(clazz.getName()); } @@ -224,9 +224,9 @@ public class LogManager { if (System.getSecurityManager() == null) { cl = Thread.currentThread().getContextClassLoader(); } else { - cl = (ClassLoader) java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public Object run() { + cl = java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction() { + public ClassLoader run() { return Thread.currentThread().getContextClassLoader(); } }