Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added unwrapping of scoped proxy tp unwrapResourceIfNecessary() (SPR-5671)

Browse Source
This commit is contained in:
Thomas Risberg
2009-11-11 18:16:41 +00:00
parent 68f57aa953
commit 2b962e7730
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.transaction/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java
View File

@@ -23,6 +23,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.core.InfrastructureProxy;
import org.springframework.util.Assert;
import org.springframework.aop.scope.ScopedObject;
/**
* Utility methods for triggering specific {@link TransactionSynchronization}
@@ -55,7 +56,13 @@ public abstract class TransactionSynchronizationUtils {
*/
static Object unwrapResourceIfNecessary(Object resource) {
Assert.notNull(resource, "Resource must not be null");
return (resource instanceof InfrastructureProxy ? ((InfrastructureProxy) resource).getWrappedObject() : resource);
Object resourceRef = resource;
if (resource instanceof ScopedObject) {
// First unwrap a scoped proxy.
resourceRef = ((ScopedObject) resource).getTargetObject();
}
// Now unwrap infrastructure proxy
return (resourceRef instanceof InfrastructureProxy ? ((InfrastructureProxy) resourceRef).getWrappedObject() : resourceRef);
}