### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core Index: model/org/eclipse/jdt/internal/core/ChangeClasspathOperation.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ChangeClasspathOperation.java,v retrieving revision 1.15 diff -u -r1.15 ChangeClasspathOperation.java --- model/org/eclipse/jdt/internal/core/ChangeClasspathOperation.java 28 Apr 2009 16:53:01 -0000 1.15 +++ model/org/eclipse/jdt/internal/core/ChangeClasspathOperation.java 12 Nov 2009 15:40:04 -0000 @@ -11,7 +11,6 @@ package org.eclipse.jdt.internal.core; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.JavaModelException; @@ -89,10 +88,6 @@ } } - protected ISchedulingRule getSchedulingRule() { - return null; // no lock taken while changing classpath - } - public boolean isReadOnly() { return !this.canChangeResources; } Index: model/org/eclipse/jdt/internal/core/UserLibraryManager.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/UserLibraryManager.java,v retrieving revision 1.18 diff -u -r1.18 UserLibraryManager.java --- model/org/eclipse/jdt/internal/core/UserLibraryManager.java 6 Jul 2009 06:49:40 -0000 1.18 +++ model/org/eclipse/jdt/internal/core/UserLibraryManager.java 12 Nov 2009 15:40:05 -0000 @@ -166,23 +166,20 @@ } public void setUserLibrary(String libName, IClasspathEntry[] entries, boolean isSystemLibrary) { - synchronized (this.userLibraries) { - IEclipsePreferences instancePreferences = JavaModelManager.getJavaModelManager().getInstancePreferences(); - String propertyName = CP_USERLIBRARY_PREFERENCES_PREFIX+libName; - try { - String propertyValue = UserLibrary.serialize(entries, isSystemLibrary); - instancePreferences.put(propertyName, propertyValue); // sends out a PreferenceChangeEvent (see preferenceChange(...)) - } catch (IOException e) { - Util.log(e, "Exception while serializing user library " + libName); //$NON-NLS-1$ - return; - } - try { - instancePreferences.flush(); - } catch (BackingStoreException e) { - Util.log(e, "Exception while saving user library " + libName); //$NON-NLS-1$ - } + IEclipsePreferences instancePreferences = JavaModelManager.getJavaModelManager().getInstancePreferences(); + String propertyName = CP_USERLIBRARY_PREFERENCES_PREFIX+libName; + try { + String propertyValue = UserLibrary.serialize(entries, isSystemLibrary); + instancePreferences.put(propertyName, propertyValue); // sends out a PreferenceChangeEvent (see preferenceChange(...)) + } catch (IOException e) { + Util.log(e, "Exception while serializing user library " + libName); //$NON-NLS-1$ + return; + } + try { + instancePreferences.flush(); + } catch (BackingStoreException e) { + Util.log(e, "Exception while saving user library " + libName); //$NON-NLS-1$ } - // this.userLibraries was updated during the PreferenceChangeEvent (see preferenceChange(...)) } }