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

made SpringBeanAutowiringInterceptor callback signature compatible with WebSphere

This commit is contained in:
Juergen Hoeller 2009-02-12 18:05:37 +00:00
parent ac104d4da0
commit f4b466dfdd
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
org.springframework.context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.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");
* you may not use this file except in compliance with the License.
@ -18,9 +18,9 @@ package org.springframework.ejb.interceptor;
import java.util.Map;
import java.util.WeakHashMap;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.ejb.EJBException;
import javax.ejb.PostActivate;
import javax.ejb.PrePassivate;
import javax.interceptor.InvocationContext;
@ -93,9 +93,18 @@ public class SpringBeanAutowiringInterceptor {
*/
@PostConstruct
@PostActivate
public void autowireBean(InvocationContext invocationContext) throws Exception {
public void autowireBean(InvocationContext invocationContext) {
doAutowireBean(invocationContext.getTarget());
invocationContext.proceed();
try {
invocationContext.proceed();
}
catch (RuntimeException ex) {
throw ex;
}
catch (Exception ex) {
// Cannot declare a checked exception on WebSphere here - so we need to wrap.
throw new EJBException(ex);
}
}
/**
@ -183,9 +192,18 @@ public class SpringBeanAutowiringInterceptor {
*/
@PreDestroy
@PrePassivate
public void releaseBean(InvocationContext invocationContext) throws Exception {
public void releaseBean(InvocationContext invocationContext) {
doReleaseBean(invocationContext.getTarget());
invocationContext.proceed();
try {
invocationContext.proceed();
}
catch (RuntimeException ex) {
throw ex;
}
catch (Exception ex) {
// Cannot declare a checked exception on WebSphere here - so we need to wrap.
throw new EJBException(ex);
}
}
/**