Attachment 88559 Details for Bug 217299 – Proposed fix

[patch] Proposed fix

217299.txt (text/plain), 3.27 KB, created by Jerome Lanneluc

on 2008-02-01 10:09:03 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Jerome Lanneluc

Created: 2008-02-01 10:09:03 EST

Size: 3.27 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/internal/core/JavaProject.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java,v
>retrieving revision 1.393
>diff -u -r1.393 JavaProject.java
>--- model/org/eclipse/jdt/internal/core/JavaProject.java	27 Nov 2007 14:23:32 -0000	1.393
>+++ model/org/eclipse/jdt/internal/core/JavaProject.java	1 Feb 2008 15:08:22 -0000
>@@ -1815,9 +1815,18 @@
> 	 */
> 	public IClasspathEntry[] getResolvedClasspath() throws JavaModelException {
> 		PerProjectInfo perProjectInfo = getPerProjectInfo();
>-		if (perProjectInfo.resolvedClasspath == null)
>+		IClasspathEntry[] resolvedClasspath = perProjectInfo.resolvedClasspath;
>+		if (resolvedClasspath == null) {
> 			resolveClasspath(perProjectInfo);
>-		return perProjectInfo.resolvedClasspath;
>+			resolvedClasspath = perProjectInfo.resolvedClasspath;
>+			if (resolvedClasspath == null) {
>+				// another thread reset the resolved classpath, use a temporary PerProjectInfo
>+				PerProjectInfo temporaryInfo = new PerProjectInfo(getProject());
>+				resolveClasspath(temporaryInfo);
>+				resolvedClasspath = temporaryInfo.resolvedClasspath;
>+			}
>+		}
>+		return resolvedClasspath;
> 	}
> 
> 	/**
>@@ -1846,6 +1855,13 @@
> 				resolvedClasspath = perProjectInfo.resolvedClasspath;
> 				unresolvedEntryStatus = perProjectInfo.unresolvedEntryStatus;
> 			}
>+			if (resolvedClasspath == null) {
>+				// another thread reset the resolved classpath, use a temporary PerProjectInfo
>+				PerProjectInfo temporaryInfo = new PerProjectInfo(getProject());
>+				resolveClasspath(temporaryInfo);
>+				resolvedClasspath = temporaryInfo.resolvedClasspath;
>+				unresolvedEntryStatus = temporaryInfo.unresolvedEntryStatus;
>+			}
> 		}
> 		if (!ignoreUnresolvedEntry && unresolvedEntryStatus != null && !unresolvedEntryStatus.isOK())
> 			throw new JavaModelException(unresolvedEntryStatus);
>Index: model/org/eclipse/jdt/internal/core/ClasspathChange.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathChange.java,v
>retrieving revision 1.10
>diff -u -r1.10 ClasspathChange.java
>--- model/org/eclipse/jdt/internal/core/ClasspathChange.java	17 Dec 2007 11:08:02 -0000	1.10
>+++ model/org/eclipse/jdt/internal/core/ClasspathChange.java	1 Feb 2008 15:08:21 -0000
>@@ -227,6 +227,15 @@
> 				newOutputLocation = perProjectInfo.outputLocation;				
> 			}
> 			
>+			if (newResolvedClasspath == null) {
>+				// another thread reset the resolved classpath, use a temporary PerProjectInfo
>+				PerProjectInfo temporaryInfo = new PerProjectInfo(this.project.getProject());
>+				this.project.resolveClasspath(temporaryInfo);
>+				newRawClasspath = temporaryInfo.rawClasspath;
>+				newResolvedClasspath = temporaryInfo.resolvedClasspath;
>+				newOutputLocation = temporaryInfo.outputLocation;				
>+			}
>+			
> 			// check if raw classpath has changed
> 			if (this.oldRawClasspath != null && !JavaProject.areClasspathsEqual(this.oldRawClasspath, newRawClasspath, this.oldOutputLocation, newOutputLocation)) {
> 				delta.changed(this.project, IJavaElementDelta.F_CLASSPATH_CHANGED);

Actions: View | Diff

Attachments on bug 217299: 88430 | 88559