From 7fdb637df0e00fe7b8a59c75d55889f1c50d3188 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 31 Oct 2012 09:03:17 +0100 Subject: [PATCH] Clarified ServletConfigAware behavior in case of no ServletConfig being available Issue: SPR-9855 --- .../web/context/ServletConfigAware.java | 13 ++++++------- .../web/context/ServletContextAware.java | 14 +++++++------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/context/ServletConfigAware.java b/spring-web/src/main/java/org/springframework/web/context/ServletConfigAware.java index 16c71d33c5..80df5308ef 100644 --- a/spring-web/src/main/java/org/springframework/web/context/ServletConfigAware.java +++ b/spring-web/src/main/java/org/springframework/web/context/ServletConfigAware.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 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. @@ -21,13 +21,12 @@ import javax.servlet.ServletConfig; import org.springframework.beans.factory.Aware; /** - * Interface to be implemented by any object that wishes to be notified - * of the ServletConfig (typically determined by the WebApplicationContext) + * Interface to be implemented by any object that wishes to be notified of the + * {@link ServletConfig} (typically determined by the {@link WebApplicationContext}) * that it runs in. * - *

Only satisfied if actually running within a Servlet-specific - * WebApplicationContext. If this callback interface is encountered - * elsewhere, an exception will be thrown on bean creation. + *

Note: Only satisfied if actually running within a Servlet-specific + * WebApplicationContext. Otherwise, no ServletConfig will be set. * * @author Juergen Hoeller * @author Chris Beams @@ -37,7 +36,7 @@ import org.springframework.beans.factory.Aware; public interface ServletConfigAware extends Aware { /** - * Set the ServletConfig that this object runs in. + * Set the {@link ServletConfig} that this object runs in. *

Invoked after population of normal bean properties but before an init * callback like InitializingBean's afterPropertiesSet or a * custom init-method. Invoked after ApplicationContextAware's diff --git a/spring-web/src/main/java/org/springframework/web/context/ServletContextAware.java b/spring-web/src/main/java/org/springframework/web/context/ServletContextAware.java index 02e599a615..f8cc701441 100644 --- a/spring-web/src/main/java/org/springframework/web/context/ServletContextAware.java +++ b/spring-web/src/main/java/org/springframework/web/context/ServletContextAware.java @@ -1,12 +1,12 @@ /* - * Copyright 2002-2011 the original author or authors. - * + * Copyright 2002-2012 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,8 +21,8 @@ import javax.servlet.ServletContext; import org.springframework.beans.factory.Aware; /** - * Interface to be implemented by any object that wishes to be notified - * of the ServletContext (typically determined by the WebApplicationContext) + * Interface to be implemented by any object that wishes to be notified of the + * {@link ServletContext} (typically determined by the {@link WebApplicationContext}) * that it runs in. * * @author Juergen Hoeller @@ -33,7 +33,7 @@ import org.springframework.beans.factory.Aware; public interface ServletContextAware extends Aware { /** - * Set the ServletContext that this object runs in. + * Set the {@link ServletContext} that this object runs in. *

Invoked after population of normal bean properties but before an init * callback like InitializingBean's afterPropertiesSet or a * custom init-method. Invoked after ApplicationContextAware's