210470: remove thread reference stored in CompilationAndWeavingContext static - it anchors the context class loader

1 files changed, 8 insertions, 0 deletions

diff --git a/bridge/src/org/aspectj/bridge/context/CompilationAndWeavingContext.java b/bridge/src/org/aspectj/bridge/context/CompilationAndWeavingContext.java
index e3a0b7b7f..9f546b131 100644
--- a/bridge/src/org/aspectj/bridge/context/CompilationAndWeavingContext.java
+++ b/bridge/src/org/aspectj/bridge/context/CompilationAndWeavingContext.java
@@ -191,6 +191,14 @@ public class CompilationAndWeavingContext {
 		}
 	}
 	
+	/**
+	 * Forget about the context for the current thread
+	 */
+	public static void resetForThread() {
+		if (!multiThreaded) return;
+		contextMap.remove(Thread.currentThread());
+	}
+	
 	private static Stack getContextStack() {
 		if (!multiThreaded) {
 			return contextStack;