### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
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.380
diff -u -r1.380 JavaModelManager.java
--- model/org/eclipse/jdt/internal/core/JavaModelManager.java	23 Nov 2007 09:09:16 -0000	1.380
+++ model/org/eclipse/jdt/internal/core/JavaModelManager.java	3 Dec 2007 17:58:21 -0000
@@ -135,7 +135,7 @@
 	/* 
 	 * Map from a package fragment root's path to a source attachment property (source path + ATTACHMENT_PROPERTY_DELIMITER + source root path)
 	 */
-	public Map rootPathToAttachments = new HashMap();
+	public Map rootPathToAttachments = new Hashtable();
 
 	public final static String CP_VARIABLE_PREFERENCES_PREFIX = JavaCore.PLUGIN_ID+".classpathVariable."; //$NON-NLS-1$
 	public final static String CP_CONTAINER_PREFERENCES_PREFIX = JavaCore.PLUGIN_ID+".classpathContainer."; //$NON-NLS-1$
Index: model/org/eclipse/jdt/internal/core/util/Util.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Util.java,v
retrieving revision 1.112
diff -u -r1.112 Util.java
--- model/org/eclipse/jdt/internal/core/util/Util.java	24 Oct 2007 13:50:51 -0000	1.112
+++ model/org/eclipse/jdt/internal/core/util/Util.java	3 Dec 2007 17:58:21 -0000
@@ -1112,7 +1112,11 @@
 	}
 
 	public static void setSourceAttachmentProperty(IPath path, String property) {
-		JavaModelManager.getJavaModelManager().rootPathToAttachments.put(path, property);
+		if (property == null) {
+			JavaModelManager.getJavaModelManager().rootPathToAttachments.put(path, PackageFragmentRoot.NO_SOURCE_ATTACHMENT);
+		} else {
+			JavaModelManager.getJavaModelManager().rootPathToAttachments.put(path, property);
+		}
 		try {
 			ResourcesPlugin.getWorkspace().getRoot().setPersistentProperty(getSourceAttachmentPropertyName(path), property);
 		} catch (CoreException e) {