root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

polishing

This commit is contained in:
Juergen Hoeller 2009-04-19 20:36:33 +00:00
parent 64321755b6
commit 58a458986f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2008 the original author or authors. * Copyright 2002-2009 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,11 +16,11 @@
package org.springframework.context.annotation; package org.springframework.context.annotation;
import static org.junit.Assert.*;
import org.junit.After; import org.junit.After;
import static org.junit.Assert.*;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.support.AopUtils; import org.springframework.aop.support.AopUtils;
import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistry;

7
org.springframework.web/src/main/java/org/springframework/web/filter/DelegatingFilterProxy.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2008 the original author or authors. * Copyright 2002-2009 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -17,7 +17,6 @@
package org.springframework.web.filter; package org.springframework.web.filter;
import java.io.IOException; import java.io.IOException;
import javax.servlet.Filter; import javax.servlet.Filter;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
import javax.servlet.ServletException; import javax.servlet.ServletException;
@ -203,7 +202,7 @@ public class DelegatingFilterProxy extends GenericFilterBean {
/** /**
* Initialize the Filter delegate, defined as bean the given Spring * Initialize the Filter delegate, defined as bean the given Spring
* application context. * application context.
* <p>Default implementation fetches the bean from the application context * <p>The default implementation fetches the bean from the application context
* and calls the standard <code>Filter.init</code> method on it, passing * and calls the standard <code>Filter.init</code> method on it, passing
* in the FilterConfig of this Filter proxy. * in the FilterConfig of this Filter proxy.
* @param wac the root application context * @param wac the root application context
@ -215,7 +214,7 @@ public class DelegatingFilterProxy extends GenericFilterBean {
* @see javax.servlet.Filter#init(javax.servlet.FilterConfig) * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
*/ */
protected Filter initDelegate(WebApplicationContext wac) throws ServletException { protected Filter initDelegate(WebApplicationContext wac) throws ServletException {
Filter delegate = (Filter) wac.getBean(getTargetBeanName(), Filter.class); Filter delegate = wac.getBean(getTargetBeanName(), Filter.class);
if (isTargetFilterLifecycle()) { if (isTargetFilterLifecycle()) {
delegate.init(getFilterConfig()); delegate.init(getFilterConfig());
} }