Attachment 100188 Details for Bug 201714 – Fix

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

[patch] Fix

bug_201714.txt (text/plain), 2.14 KB, created by Tomasz Zarna

on 2008-05-14 10:42:08 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2008-05-14 10:42:08 EDT

Size: 2.14 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.core
>Index: src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoCollector.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoCollector.java,v
>retrieving revision 1.11
>diff -u -r1.11 SubscriberSyncInfoCollector.java
>--- src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoCollector.java	29 Mar 2006 17:15:41 -0000	1.11
>+++ src/org/eclipse/team/internal/core/subscribers/SubscriberSyncInfoCollector.java	14 May 2008 14:22:43 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2006 IBM Corporation and others.
>+ * Copyright (c) 2000, 2008 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -70,20 +70,29 @@
> 	}
> 
> 	/**
>-	 * This causes the calling thread to wait any background collection of out-of-sync resources
>-	 * to stop before returning.
>-	 * @param monitor a progress monitor
>+	 * This causes the calling thread to wait any background collection of
>+	 * out-of-sync resources to stop before returning.
>+	 * 
>+	 * @param monitor
>+	 * 		a progress monitor
> 	 */
> 	public void waitForCollector(IProgressMonitor monitor) {
> 		monitor.worked(1);
>-		// wait for the event handler to process changes.
>-		while(eventHandler.getEventHandlerJob().getState() != Job.NONE) {
>-			monitor.worked(1);
>+		int i = 0;
>+		// wait for the event handler to process changes
>+		while (true) {
> 			try {
>-				Thread.sleep(10);		
>+				Thread.sleep(5);
> 			} catch (InterruptedException e) {
> 			}
> 			Policy.checkCanceled(monitor);
>+			
>+			// increment the counter or reset it if the job is running 
>+			i = (eventHandler.getEventHandlerJob().getState() == Job.NONE) ? i + 1 : 0;
>+			
>+			// 50 positive checks in a row 
>+			if (i == 50)
>+				break;
> 		}
> 		monitor.worked(1);
> 	}

Actions: View | Diff

Attachments on bug 201714: 100188