Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SPR-15469 Lazily initialize Environment in GenericFilterBean #1405

Closed
wants to merge 1 commit into from
Closed

SPR-15469 Lazily initialize Environment in GenericFilterBean #1405

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 21 additions & 2 deletions spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.EnvironmentAware;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.Environment;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceEditor;
Expand Down Expand Up @@ -91,7 +92,7 @@ public abstract class GenericFilterBean implements

private String beanName;

private Environment environment = new StandardServletEnvironment();
private Environment environment;

private ServletContext servletContext;

Expand Down Expand Up @@ -184,7 +185,7 @@ public final void init(FilterConfig filterConfig) throws ServletException {
PropertyValues pvs = new FilterConfigPropertyValues(filterConfig, this.requiredProperties);
BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(this);
ResourceLoader resourceLoader = new ServletContextResourceLoader(filterConfig.getServletContext());
bw.registerCustomEditor(Resource.class, new ResourceEditor(resourceLoader, this.environment));
bw.registerCustomEditor(Resource.class, new ResourceEditor(resourceLoader, getEnvironment()));
initBeanWrapper(bw);
bw.setPropertyValues(pvs, true);
}
Expand Down Expand Up @@ -283,6 +284,24 @@ protected void initFilterBean() throws ServletException {
public void destroy() {
}

/**
* <p>If {@code null}, a new environment will be initialized via
* {@link #createEnvironment()}.
*/
public Environment getEnvironment() {
if (this.environment == null) {
this.environment = this.createEnvironment();
}
return this.environment;
}

/**
* Create and return a new {@link StandardServletEnvironment}. Subclasses may override
* in order to configure the environment or specialize the environment type returned.
*/
protected ConfigurableEnvironment createEnvironment() {
return new StandardServletEnvironment();
}

/**
* PropertyValues implementation created from FilterConfig init parameters.
Expand Down