Attachment 186685 Details for Bug 334172 – Fix Patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix Patch

334172_indexer_fix.txt (text/plain), 2.23 KB, created by Ian Tewksbury

on 2011-01-12 16:58:32 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Tewksbury

Created: 2011-01-12 16:58:32 EST

Size: 2.23 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.sse.core
>Index: src/org/eclipse/wst/sse/core/indexing/AbstractIndexManager.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/indexing/AbstractIndexManager.java,v
>retrieving revision 1.1.2.2
>diff -u -r1.1.2.2 AbstractIndexManager.java
>--- src/org/eclipse/wst/sse/core/indexing/AbstractIndexManager.java	10 Jan 2011 19:07:41 -0000	1.1.2.2
>+++ src/org/eclipse/wst/sse/core/indexing/AbstractIndexManager.java	12 Jan 2011 21:56:53 -0000
>@@ -239,11 +239,12 @@
> 				progress.setWorkRemaining(1);
> 				
> 				//don't bother processing saved delta if forced full re-index is needed
>-				boolean stillNeedFullReIndex = forcedFullReIndexNeeded;
> 				if(!forcedFullReIndexNeeded) {
>-					//if there is a delta attempt to process it
>+					/* if there is a delta attempt to process it
>+					 * else need to do a full workspace index
>+					 */
> 					if(savedStateDelta != null) {
>-						stillNeedFullReIndex = false;
>+						forcedFullReIndexNeeded = false;
> 						try {
> 							//deal with reporting progress
> 							SubMonitor savedStateProgress = progress.newChild(1, SubMonitor.SUPPRESS_NONE);
>@@ -256,16 +257,18 @@
> 							//process any remaining batched up resources to index
> 							visitor.processBatchedResourceEvents();
> 						} catch (CoreException e) {
>-							stillNeedFullReIndex = true;
>+							forcedFullReIndexNeeded = true;
> 							Logger.logException(this.fName + ": Could not process saved state. " + //$NON-NLS-1$
> 									"Forced to do a full workspace re-index.", e); //$NON-NLS-1$
> 						}
>+					} else {
>+						forcedFullReIndexNeeded = true;
> 					}
> 				}
> 				progress.worked(1);
> 				
> 				//if need to process the entire workspace do so in another job
>-				if(stillNeedFullReIndex){
>+				if(forcedFullReIndexNeeded){
> 					this.fWorkspaceVisitorJob = new WorkspaceVisitorJob();
> 					this.fWorkspaceVisitorJob.schedule();
> 				}
>@@ -652,9 +655,6 @@
> 						}
> 						visitChildren = true;
> 					}
>-					visitChildren = false;
>-				} else {
>-					visitChildren = false;
> 				}
> 				
> 				//batch up resource changes before sending them out

Actions: View | Diff

Attachments on bug 334172: 186685