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

consistent use of JDK 1.5's ThreadLocal.remove() over ThreadLocal.set(null), preventing leaks (SPR-7441)

Browse Source
This commit is contained in:
Juergen Hoeller
2010-09-01 17:17:25 +00:00
parent 66a5bb7c22
commit e56cfb8173
14 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.aop/src/main/java/org/springframework/aop/framework/AopContext.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2009 the original author or authors.
* Copyright 2002-2010 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.
@@ -76,7 +76,12 @@ public abstract class AopContext {
*/
static Object setCurrentProxy(Object proxy) {
Object old = currentProxy.get();
currentProxy.set(proxy);
if (proxy != null) {
currentProxy.set(proxy);
}
else {
currentProxy.remove();
}
return old;
}

4
org.springframework.aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2010 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.
@@ -106,7 +106,7 @@ public class ThreadLocalTargetSource extends AbstractPrototypeBasedTargetSource
this.targetSet.clear();
}
// Clear ThreadLocal, just in case.
this.targetInThread.set(null);
this.targetInThread.remove();
}