--- ApplicationContext.java	2007-07-03 20:05:00.000000000 +0200
+++ /Users/ajvanerp/ApplicationContext.java	2008-08-18 15:02:59.000000000 +0200
@@ -47,8 +47,11 @@
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Iterator;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
 // START PWC 1.2
 import java.security.SecurityPermission;
 // START PWC 1.2
@@ -139,7 +142,7 @@
     /**
      * The context attributes for this context.
      */
-    private HashMap attributes = new HashMap();
+    private Map attributes = new ConcurrentHashMap();
 
 
     /**
@@ -231,11 +234,7 @@
      * @param name Name of the context attribute to return
      */
     public Object getAttribute(String name) {
-
-        synchronized (attributes) {
             return (attributes.get(name));
-        }
-
     }
 
 
@@ -244,11 +243,7 @@
      * associated with this context.
      */
     public Enumeration getAttributeNames() {
-
-        synchronized (attributes) {
             return new Enumerator(attributes.keySet(), true);
-        }
-
     }