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

SpringBeanAutowiringInterceptor eagerly releases BeanFactory if post-construction fails 

Issue: SPR-10013
This commit is contained in:
Juergen Hoeller 2013-01-18 14:12:02 +01:00
parent 20c4ba40d8
commit 721fa9db6a
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 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,7 +16,6 @@
package org.springframework.beans.factory.access; package org.springframework.beans.factory.access;
import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactory;
/** /**
@ -49,11 +48,10 @@ public interface BeanFactoryReference {
* <p>In an EJB usage scenario this would normally be called from * <p>In an EJB usage scenario this would normally be called from
* {@code ejbRemove()} and {@code ejbPassivate()}. * {@code ejbRemove()} and {@code ejbPassivate()}.
* <p>This is safe to call multiple times. * <p>This is safe to call multiple times.
* @throws FatalBeanException if the {@code BeanFactory} cannot be released
* @see BeanFactoryLocator * @see BeanFactoryLocator
* @see org.springframework.context.access.ContextBeanFactoryReference * @see org.springframework.context.access.ContextBeanFactoryReference
* @see org.springframework.context.ConfigurableApplicationContext#close() * @see org.springframework.context.ConfigurableApplicationContext#close()
*/ */
void release() throws FatalBeanException; void release();
} }

10
spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 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.
@ -71,8 +71,6 @@ import org.springframework.context.access.ContextSingletonBeanFactoryLocator;
* @see org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor * @see org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor
* @see org.springframework.context.access.ContextSingletonBeanFactoryLocator * @see org.springframework.context.access.ContextSingletonBeanFactoryLocator
* @see #getBeanFactoryLocatorKey * @see #getBeanFactoryLocatorKey
* @see org.springframework.ejb.support.AbstractEnterpriseBean#setBeanFactoryLocator
* @see org.springframework.ejb.support.AbstractEnterpriseBean#setBeanFactoryLocatorKey
*/ */
public class SpringBeanAutowiringInterceptor { public class SpringBeanAutowiringInterceptor {
@ -99,9 +97,15 @@ public class SpringBeanAutowiringInterceptor {
invocationContext.proceed(); invocationContext.proceed();
} }
catch (RuntimeException ex) { catch (RuntimeException ex) {
doReleaseBean(invocationContext.getTarget());
throw ex; throw ex;
} }
catch (Error err) {
doReleaseBean(invocationContext.getTarget());
throw err;
}
catch (Exception ex) { catch (Exception ex) {
doReleaseBean(invocationContext.getTarget());
// Cannot declare a checked exception on WebSphere here - so we need to wrap. // Cannot declare a checked exception on WebSphere here - so we need to wrap.
throw new EJBException(ex); throw new EJBException(ex);
} }