made field final - does that avoid NPE on line 105 under tomcat?

diff --git a/loadtime/src/org/aspectj/weaver/loadtime/Aj.java b/loadtime/src/org/aspectj/weaver/loadtime/Aj.java
index 4df029d2fb183a498878428df914381f362419aa..30106ca3e6d8f42f86cc168ae3a9738e25ef06a0 100644 (file)
--- a/loadtime/src/org/aspectj/weaver/loadtime/Aj.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/Aj.java
@@ -98,7 +98,7 @@ public class Aj implements ClassPreProcessor {
      */
     static class WeaverContainer {
 
-        private static Map weavingAdaptors = new WeakHashMap();
+        private final static Map weavingAdaptors = new WeakHashMap();
 
         static WeavingAdaptor getWeaver(ClassLoader loader, IWeavingContext weavingContext) {
             ExplicitlyInitializedClassLoaderWeavingAdaptor adaptor = null;