Attachment 191527 Details for Bug 339711 – Fix Patch

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

[patch] Fix Patch

339711_indexer_progress.txt (text/plain), 5.26 KB, created by Ian Tewksbury

on 2011-03-18 13:25:37 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Tewksbury

Created: 2011-03-18 13:25:37 EDT

Size: 5.26 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.3
>diff -u -r1.1.2.3 AbstractIndexManager.java
>--- src/org/eclipse/wst/sse/core/indexing/AbstractIndexManager.java	13 Jan 2011 04:53:15 -0000	1.1.2.3
>+++ src/org/eclipse/wst/sse/core/indexing/AbstractIndexManager.java	18 Mar 2011 17:23:58 -0000
>@@ -221,62 +221,66 @@
> 		synchronized (this.fStartStopLock) {
> 			this.fStarting = true;
> 			
>-			if(this.fState == STATE_DISABLED) {
>-				//report status
>-				progress.beginTask(this.fName, 2);
>-				
>-				//start listening for resource change events
>-				this.fResourceChangeListener.start();
>-				
>-				//check to see if a full re-index is required
>-				boolean forcedFullReIndexNeeded = this.isForcedFullReIndexNeeded();
>-				
>-				/* start the indexing job only loading preserved state if not doing full index
>-				 * if failed loading preserved state then force full re-index
>-				 */
>-				forcedFullReIndexNeeded = !this.fResourceEventProcessingJob.start(!forcedFullReIndexNeeded,
>-						progress.newChild(1));
>-				progress.setWorkRemaining(1);
>-				
>-				//don't bother processing saved delta if forced full re-index is needed
>-				if(!forcedFullReIndexNeeded) {
>-					/* if there is a delta attempt to process it
>-					 * else need to do a full workspace index
>+			try {
>+				if(this.fState == STATE_DISABLED) {
>+					//report status
>+					progress.beginTask(this.fName, 2);
>+					
>+					//start listening for resource change events
>+					this.fResourceChangeListener.start();
>+					
>+					//check to see if a full re-index is required
>+					boolean forcedFullReIndexNeeded = this.isForcedFullReIndexNeeded();
>+					
>+					/* start the indexing job only loading preserved state if not doing full index
>+					 * if failed loading preserved state then force full re-index
> 					 */
>-					if(savedStateDelta != null) {
>-						forcedFullReIndexNeeded = false;
>-						try {
>-							//deal with reporting progress
>-							SubMonitor savedStateProgress = progress.newChild(1, SubMonitor.SUPPRESS_NONE);
>-							
>-							//process delta
>-							ResourceDeltaVisitor visitor = new ResourceDeltaVisitor(savedStateProgress,
>-									AbstractIndexManager.SOURCE_SAVED_STATE);
>-							savedStateDelta.accept(visitor);
>-							
>-							//process any remaining batched up resources to index
>-							visitor.processBatchedResourceEvents();
>-						} catch (CoreException e) {
>+					forcedFullReIndexNeeded = !this.fResourceEventProcessingJob.start(!forcedFullReIndexNeeded,
>+							progress.newChild(1));
>+					progress.setWorkRemaining(1);
>+					
>+					//don't bother processing saved delta if forced full re-index is needed
>+					if(!forcedFullReIndexNeeded) {
>+						/* if there is a delta attempt to process it
>+						 * else need to do a full workspace index
>+						 */
>+						if(savedStateDelta != null) {
>+							forcedFullReIndexNeeded = false;
>+							try {
>+								//deal with reporting progress
>+								SubMonitor savedStateProgress = progress.newChild(1, SubMonitor.SUPPRESS_NONE);
>+								
>+								//process delta
>+								ResourceDeltaVisitor visitor = new ResourceDeltaVisitor(savedStateProgress,
>+										AbstractIndexManager.SOURCE_SAVED_STATE);
>+								savedStateDelta.accept(visitor);
>+								
>+								//process any remaining batched up resources to index
>+								visitor.processBatchedResourceEvents();
>+							} catch (CoreException e) {
>+								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;
>-							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(forcedFullReIndexNeeded){
>+						this.fWorkspaceVisitorJob = new WorkspaceVisitorJob();
>+						this.fWorkspaceVisitorJob.schedule();
>+					}
>+					
>+					//update state
>+					this.fState = STATE_ENABLED;
> 				}
>-				progress.worked(1);
>-				
>-				//if need to process the entire workspace do so in another job
>-				if(forcedFullReIndexNeeded){
>-					this.fWorkspaceVisitorJob = new WorkspaceVisitorJob();
>-					this.fWorkspaceVisitorJob.schedule();
>-				}
>-				
>-				//update state
>-				this.fState = STATE_ENABLED;
>+			} finally {
>+				progress.done();
>+				this.fStarting = false;
> 			}
>-			this.fStarting = false;
> 		}
> 	}
> 	
>@@ -447,6 +451,7 @@
> 			Thread.currentThread().interrupt();
> 		}
> 		
>+		progress.done();
> 		return success;
> 	}
> 	
>@@ -585,6 +590,7 @@
> 				status = Status.OK_STATUS;
> 			}
> 			
>+			monitor.done();
> 			return status;
> 		}
> 		
>@@ -1608,6 +1614,7 @@
> 				}
> 			}
> 			
>+			progress.done();
> 			return success;
> 		}
>

Actions: View | Diff

Attachments on bug 339711: 191527