Browse Source

Polishing

pull/602/merge
Juergen Hoeller 12 years ago
parent
commit
3bcfc591e9
  1. 6
      spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj
  2. 2
      spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java

6
spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj

@ -51,11 +51,11 @@ public aspect AnnotationBeanConfigurerAspect extends AbstractInterfaceDrivenDepe
public void setBeanFactory(BeanFactory beanFactory) { public void setBeanFactory(BeanFactory beanFactory) {
this.beanConfigurerSupport.setBeanFactory(beanFactory);
this.beanConfigurerSupport.setBeanWiringInfoResolver(new AnnotationBeanWiringInfoResolver()); this.beanConfigurerSupport.setBeanWiringInfoResolver(new AnnotationBeanWiringInfoResolver());
this.beanConfigurerSupport.setBeanFactory(beanFactory);
} }
public void afterPropertiesSet() throws Exception { public void afterPropertiesSet() {
this.beanConfigurerSupport.afterPropertiesSet(); this.beanConfigurerSupport.afterPropertiesSet();
} }
@ -63,7 +63,7 @@ public aspect AnnotationBeanConfigurerAspect extends AbstractInterfaceDrivenDepe
this.beanConfigurerSupport.configureBean(bean); this.beanConfigurerSupport.configureBean(bean);
} }
public void destroy() throws Exception { public void destroy() {
this.beanConfigurerSupport.destroy(); this.beanConfigurerSupport.destroy();
} }

2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java

@ -233,6 +233,7 @@ public class ExceptionHandlerExceptionResolver extends AbstractHandlerMethodExce
return this.applicationContext; return this.applicationContext;
} }
@Override @Override
public void afterPropertiesSet() { public void afterPropertiesSet() {
// Do this first, it may add ResponseBodyAdvice beans // Do this first, it may add ResponseBodyAdvice beans
@ -335,6 +336,7 @@ public class ExceptionHandlerExceptionResolver extends AbstractHandlerMethodExce
return handlers; return handlers;
} }
/** /**
* Find an {@code @ExceptionHandler} method and invoke it to handle the raised exception. * Find an {@code @ExceptionHandler} method and invoke it to handle the raised exception.
*/ */

Loading…
Cancel
Save