Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-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 4A5D9D3DF for ; Tue, 15 Jan 2013 21:09:28 +0000 (UTC) Received: (qmail 28933 invoked by uid 500); 15 Jan 2013 21:09:28 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 28906 invoked by uid 500); 15 Jan 2013 21:09:28 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 28899 invoked by uid 99); 15 Jan 2013 21:09:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Jan 2013 21:09:28 +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; Tue, 15 Jan 2013 21:09:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4D1112388847; Tue, 15 Jan 2013 21:09:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1433650 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java Date: Tue, 15 Jan 2013 21:09:02 -0000 To: commits@struts.apache.org From: lukaszlenart@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130115210902.4D1112388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: lukaszlenart Date: Tue Jan 15 21:09:01 2013 New Revision: 1433650 URL: http://svn.apache.org/viewvc?rev=1433650&view=rev Log: WW-3962 removes duplicated initialisation of loggerFactory Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java?rev=1433650&r1=1433649&r2=1433650&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java Tue Jan 15 21:09:01 2013 @@ -62,10 +62,11 @@ import java.util.StringTokenizer; *

*/ public class DefaultStaticContentLoader implements StaticContentLoader { + /** * Provide a logging instance. */ - private Logger log; + private Logger LOG = LoggerFactory.getLogger(DefaultStaticContentLoader.class); /** * Store set of path prefixes to use with static resources. @@ -137,7 +138,6 @@ public class DefaultStaticContentLoader packages = param + " " + packages; } this.pathPrefixes = parse(packages); - initLogging(filterConfig); } protected String getAdditionalPackages() { @@ -213,8 +213,9 @@ public class DefaultStaticContentLoader try { ifModifiedSince = request.getDateHeader("If-Modified-Since"); } catch (Exception e) { - log.warn("Invalid If-Modified-Since header value: '" - + request.getHeader("If-Modified-Since") + "', ignoring"); + if (LOG.isWarnEnabled()) { + LOG.warn("Invalid If-Modified-Since header value: '#0', ignoring", request.getHeader("If-Modified-Since")); + } } long lastModifiedMillis = lastModifiedCal.getTimeInMillis(); long now = cal.getTimeInMillis(); @@ -257,29 +258,6 @@ public class DefaultStaticContentLoader } } - private void initLogging(HostConfig filterConfig) { - String factoryName = filterConfig.getInitParameter("loggerFactory"); - if (factoryName != null) { - try { - Class cls = ClassLoaderUtil.loadClass(factoryName, this.getClass()); - LoggerFactory fac = (LoggerFactory)cls.newInstance(); - LoggerFactory.setLoggerFactory(fac); - } catch (InstantiationException e) { - System.err.println("Unable to instantiate logger factory: "+factoryName+", using default"); - e.printStackTrace(); - } catch (IllegalAccessException e) { - System.err.println("Unable to access logger factory: "+factoryName+", using default"); - e.printStackTrace(); - } catch (ClassNotFoundException e) { - System.err.println("Unable to locate logger factory class: "+factoryName+", using default"); - e.printStackTrace(); - } - } - - log = LoggerFactory.getLogger(DefaultStaticContentLoader.class); - - } - /** * Look for a static resource in the classpath. *