From 426d84d3f836d5516956293f5a2e9ab3f7eb6f85 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 20 Nov 2008 22:12:56 +0000 Subject: [PATCH] ContextLoaderListener extends ContextLoader git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@317 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../web/context/ContextLoaderListener.java | 15 ++++++++++++--- .../web/util/Log4jWebConfigurer.java | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/ContextLoaderListener.java b/org.springframework.web/src/main/java/org/springframework/web/context/ContextLoaderListener.java index eea4a68d2f9..a0657e15de4 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/ContextLoaderListener.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/ContextLoaderListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2008 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ import javax.servlet.ServletContextListener; * @since 17.02.2003 * @see org.springframework.web.util.Log4jConfigListener */ -public class ContextLoaderListener implements ServletContextListener { +public class ContextLoaderListener extends ContextLoader implements ServletContextListener { private ContextLoader contextLoader; @@ -41,21 +41,30 @@ public class ContextLoaderListener implements ServletContextListener { */ public void contextInitialized(ServletContextEvent event) { this.contextLoader = createContextLoader(); + if (this.contextLoader == null) { + this.contextLoader = this; + } this.contextLoader.initWebApplicationContext(event.getServletContext()); } /** * Create the ContextLoader to use. Can be overridden in subclasses. * @return the new ContextLoader + * @deprecated in favor of simply subclassing ContextLoaderListener itself + * (which extends ContextLoader, as of Spring 3.0) */ + @Deprecated protected ContextLoader createContextLoader() { - return new ContextLoader(); + return null; } /** * Return the ContextLoader used by this listener. * @return the current ContextLoader + * @deprecated in favor of simply subclassing ContextLoaderListener itself + * (which extends ContextLoader, as of Spring 3.0) */ + @Deprecated public ContextLoader getContextLoader() { return this.contextLoader; } diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/Log4jWebConfigurer.java b/org.springframework.web/src/main/java/org/springframework/web/util/Log4jWebConfigurer.java index 31906e970c8..729df79bb54 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/util/Log4jWebConfigurer.java +++ b/org.springframework.web/src/main/java/org/springframework/web/util/Log4jWebConfigurer.java @@ -183,7 +183,7 @@ public abstract class Log4jWebConfigurer { */ private static boolean exposeWebAppRoot(ServletContext servletContext) { String exposeWebAppRootParam = servletContext.getInitParameter(EXPOSE_WEB_APP_ROOT_PARAM); - return (exposeWebAppRootParam == null || Boolean.valueOf(exposeWebAppRootParam).booleanValue()); + return (exposeWebAppRootParam == null || Boolean.valueOf(exposeWebAppRootParam)); } }