Attachment 86655 Details for Bug 214981 – Proposed fix against R3_2_maintenance

[patch] Proposed fix against R3_2_maintenance

214981.txt (text/plain), 6.02 KB, created by Jerome Lanneluc

on 2008-01-11 05:21:07 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Jerome Lanneluc

Created: 2008-01-11 05:21:07 EST

Size: 6.02 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/internal/core/DeltaProcessingState.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessingState.java,v
>retrieving revision 1.36
>diff -u -r1.36 DeltaProcessingState.java
>--- model/org/eclipse/jdt/internal/core/DeltaProcessingState.java	29 Mar 2006 03:08:48 -0000	1.36
>+++ model/org/eclipse/jdt/internal/core/DeltaProcessingState.java	11 Jan 2008 10:20:10 -0000
>@@ -22,6 +22,7 @@
> 
> import org.eclipse.core.resources.*;
> import org.eclipse.core.runtime.*;
>+import org.eclipse.core.runtime.jobs.ISchedulingRule;
> import org.eclipse.jdt.core.*;
> import org.eclipse.jdt.core.compiler.CharOperation;
> import org.eclipse.jdt.internal.core.util.Util;
>@@ -93,7 +94,7 @@
> 		 */
> 		public void updateProjectReferencesIfNecessary() throws JavaModelException {
> 			
>-			String[] oldRequired = this.oldResolvedPath == null ? CharOperation.NO_STRINGS : this.project.projectPrerequisites(this.oldResolvedPath);
>+			final String[] oldRequired = this.oldResolvedPath == null ? CharOperation.NO_STRINGS : this.project.projectPrerequisites(this.oldResolvedPath);
> 	
> 			if (this.newResolvedPath == null) {
> 				if (this.newRawPath == null)
>@@ -106,59 +107,67 @@
> 						true/*generate marker on error*/, 
> 						null/*no reverse map*/);
> 			}
>-			String[] newRequired = this.project.projectPrerequisites(this.newResolvedPath);
>-			try {
>-				IProject projectResource = this.project.getProject();
>-				IProjectDescription description = projectResource.getDescription();
>-				 
>-				IProject[] projectReferences = description.getDynamicReferences();
>-				
>-				HashSet oldReferences = new HashSet(projectReferences.length);
>-				for (int i = 0; i < projectReferences.length; i++){
>-					String projectName = projectReferences[i].getName();
>-					oldReferences.add(projectName);
>-				}
>-				HashSet newReferences = (HashSet)oldReferences.clone();
>-		
>-				for (int i = 0; i < oldRequired.length; i++){
>-					String projectName = oldRequired[i];
>-					newReferences.remove(projectName);
>-				}
>-				for (int i = 0; i < newRequired.length; i++){
>-					String projectName = newRequired[i];
>-					newReferences.add(projectName);
>-				}
>-		
>-				Iterator iter;
>-				int newSize = newReferences.size();
>-				
>-				checkIdentity: {
>-					if (oldReferences.size() == newSize){
>-						iter = newReferences.iterator();
>-						while (iter.hasNext()){
>-							if (!oldReferences.contains(iter.next())){
>-								break checkIdentity;
>+			final String[] newRequired = this.project.projectPrerequisites(this.newResolvedPath);
>+			final IProject projectResource = this.project.getProject();
>+			IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
>+				public void run(IProgressMonitor monitor) throws CoreException {
>+					IProjectDescription description = projectResource.getDescription();
>+					 
>+					IProject[] projectReferences = description.getDynamicReferences();
>+					
>+					HashSet oldReferences = new HashSet(projectReferences.length);
>+					for (int i = 0; i < projectReferences.length; i++){
>+						String projectName = projectReferences[i].getName();
>+						oldReferences.add(projectName);
>+					}
>+					HashSet newReferences = (HashSet)oldReferences.clone();
>+			
>+					for (int i = 0; i < oldRequired.length; i++){
>+						String projectName = oldRequired[i];
>+						newReferences.remove(projectName);
>+					}
>+					for (int i = 0; i < newRequired.length; i++){
>+						String projectName = newRequired[i];
>+						newReferences.add(projectName);
>+					}
>+			
>+					Iterator iter;
>+					int newSize = newReferences.size();
>+					
>+					checkIdentity: {
>+						if (oldReferences.size() == newSize){
>+							iter = newReferences.iterator();
>+							while (iter.hasNext()){
>+								if (!oldReferences.contains(iter.next())){
>+									break checkIdentity;
>+								}
> 							}
>+							return;
> 						}
>-						return;
> 					}
>+					String[] requiredProjectNames = new String[newSize];
>+					int index = 0;
>+					iter = newReferences.iterator();
>+					while (iter.hasNext()){
>+						requiredProjectNames[index++] = (String)iter.next();
>+					}
>+					Util.sort(requiredProjectNames); // ensure that if changed, the order is consistent
>+					
>+					IProject[] requiredProjectArray = new IProject[newSize];
>+					IWorkspaceRoot wksRoot = projectResource.getWorkspace().getRoot();
>+					for (int i = 0; i < newSize; i++){
>+						requiredProjectArray[i] = wksRoot.getProject(requiredProjectNames[i]);
>+					}
>+					description.setDynamicReferences(requiredProjectArray);
>+					projectResource.setDescription(description, null);
> 				}
>-				String[] requiredProjectNames = new String[newSize];
>-				int index = 0;
>-				iter = newReferences.iterator();
>-				while (iter.hasNext()){
>-					requiredProjectNames[index++] = (String)iter.next();
>-				}
>-				Util.sort(requiredProjectNames); // ensure that if changed, the order is consistent
>-				
>-				IProject[] requiredProjectArray = new IProject[newSize];
>-				IWorkspaceRoot wksRoot = projectResource.getWorkspace().getRoot();
>-				for (int i = 0; i < newSize; i++){
>-					requiredProjectArray[i] = wksRoot.getProject(requiredProjectNames[i]);
>-				}
>-				description.setDynamicReferences(requiredProjectArray);
>-				projectResource.setDescription(description, null);
>-		
>+			};
>+			try {
>+				// ensure that a sheduling rule is used so that the project description is not modified by another thread while we update it
>+				// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=214981
>+				IWorkspace workspace = projectResource.getWorkspace();
>+				ISchedulingRule rule = workspace.getRuleFactory().modifyRule(projectResource); // sheduling rule for modifying the project
>+				workspace.run(runnable, rule, IWorkspace.AVOID_UPDATE, null);
> 			} catch(CoreException e){
> 				if (!ExternalJavaProject.EXTERNAL_PROJECT_NAME.equals(this.project.getElementName()))
> 					throw new JavaModelException(e);

Actions: View | Diff

Attachments on bug 214981: 86655 | 86662