Attachment 194837 Details for Bug 303517 – fix for the performance regression

[patch] fix for the performance regression

bug_303517.patch (text/plain), 2.47 KB, created by James Blackburn

on 2011-05-05 11:00:06 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: James Blackburn

Created: 2011-05-05 11:00:06 EDT

Size: 2.47 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.core.resources
>Index: src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java,v
>retrieving revision 1.132
>diff -u -r1.132 FileSystemResourceManager.java
>--- src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java	31 Mar 2011 10:40:47 -0000	1.132
>+++ src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java	5 May 2011 14:56:46 -0000
>@@ -752,22 +752,24 @@
> 
> 	public InputStream read(IFile target, boolean force, IProgressMonitor monitor) throws CoreException {
> 		IFileStore store = getStore(target);
>-		final IFileInfo fileInfo = store.fetchInfo();
>-		if (!fileInfo.exists()) {
>-			asyncRefresh(target);
>-			if (!force) {
>-				String message = NLS.bind(Messages.localstore_fileNotFound, store.toString());
>-				throw new ResourceException(IResourceStatus.FAILED_READ_LOCAL, target.getFullPath(), message, null);
>+		if (lightweightAutoRefreshEnabled || !force) {
>+			final IFileInfo fileInfo = store.fetchInfo();
>+			if (!fileInfo.exists()) {
>+				asyncRefresh(target);
>+				if (!force) {
>+					String message = NLS.bind(Messages.localstore_fileNotFound, store.toString());
>+					throw new ResourceException(IResourceStatus.FAILED_READ_LOCAL, target.getFullPath(), message, null);
>+				}
> 			}
>-		}
>-		ResourceInfo info = ((Resource) target).getResourceInfo(true, false);
>-		int flags = ((Resource) target).getFlags(info);
>-		((Resource) target).checkExists(flags, true);
>-		if (fileInfo.getLastModified() != info.getLocalSyncInfo()) {
>-			asyncRefresh(target);
>-			if (!force) {
>-				String message = NLS.bind(Messages.localstore_resourceIsOutOfSync, target.getFullPath());
>-				throw new ResourceException(IResourceStatus.OUT_OF_SYNC_LOCAL, target.getFullPath(), message, null);
>+			ResourceInfo info = ((Resource) target).getResourceInfo(true, false);
>+			int flags = ((Resource) target).getFlags(info);
>+			((Resource) target).checkExists(flags, true);
>+			if (fileInfo.getLastModified() != info.getLocalSyncInfo()) {
>+				asyncRefresh(target);
>+				if (!force) {
>+					String message = NLS.bind(Messages.localstore_resourceIsOutOfSync, target.getFullPath());
>+					throw new ResourceException(IResourceStatus.OUT_OF_SYNC_LOCAL, target.getFullPath(), message, null);
>+				}
> 			}
> 		}
> 		return store.openInputStream(EFS.NONE, monitor);

Flags:

jamesblackburn+eclipse: review?

Actions: View | Diff

Attachments on bug 303517: 188377 | 189175 | 189549 | 189685 | 189686 | 189752 | 189780 | 189895 | 191362 | 191898 | 191906 | 191910 | 194837