### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: model/org/eclipse/jdt/core/JavaCore.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java,v
retrieving revision 1.593
diff -u -r1.593 JavaCore.java
--- model/org/eclipse/jdt/core/JavaCore.java	19 Nov 2007 12:09:06 -0000	1.593
+++ model/org/eclipse/jdt/core/JavaCore.java	23 Nov 2007 09:06:05 -0000
@@ -1653,7 +1653,7 @@
 	 * @since 2.1
 	 */
 	public static ClasspathContainerInitializer getClasspathContainerInitializer(String containerID) {
-		HashMap containerInitializersCache = JavaModelManager.getJavaModelManager().containerInitializersCache;
+		Hashtable containerInitializersCache = JavaModelManager.getJavaModelManager().containerInitializersCache;
 		ClasspathContainerInitializer initializer = (ClasspathContainerInitializer) containerInitializersCache.get(containerID);
 		if (initializer == null) {
 			initializer = computeClasspathContainerInitializer(containerID);
Index: model/org/eclipse/jdt/internal/core/JavaModelManager.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java,v
retrieving revision 1.379
diff -u -r1.379 JavaModelManager.java
--- model/org/eclipse/jdt/internal/core/JavaModelManager.java	11 Oct 2007 11:32:48 -0000	1.379
+++ model/org/eclipse/jdt/internal/core/JavaModelManager.java	23 Nov 2007 09:06:05 -0000
@@ -108,7 +108,7 @@
 	public int batchContainerInitializations = NO_BATCH_INITIALIZATION;
 	
 	public BatchInitializationMonitor batchContainerInitializationsProgress = new BatchInitializationMonitor();
-	public HashMap containerInitializersCache = new HashMap(5);
+	public Hashtable containerInitializersCache = new Hashtable(5);
 	
 	/*
 	 * A HashSet that contains the IJavaProject whose classpath is being resolved.
@@ -2188,14 +2188,16 @@
 			*/
 		}
 		// TODO (frederic) remove following block when JDT/UI dummy project will be thrown away...
-		HashSet containerPaths = (HashSet) allContainerPaths.get(javaProjectToInit);
-		if (containerPaths == null) {
-			containerPaths = new HashSet();
-			allContainerPaths.put(javaProjectToInit, containerPaths);
-		}
-		containerPaths.add(containerToInit);
-		// mark container as being initialized
-		containerAddInitializationInProgress(javaProjectToInit, containerToInit);
+		if (javaProjectToInit != null) {
+			HashSet containerPaths = (HashSet) allContainerPaths.get(javaProjectToInit);
+			if (containerPaths == null) {
+				containerPaths = new HashSet();
+				allContainerPaths.put(javaProjectToInit, containerPaths);
+			}
+			containerPaths.add(containerToInit);
+			// mark container as being initialized
+			containerAddInitializationInProgress(javaProjectToInit, containerToInit);
+		}
 		// end block
 		
 		// initialize all containers