Attachment 187517 Details for Bug 327143 – Proposed fix

[patch] Proposed fix

patch_327143.txt (text/plain), 1.55 KB, created by Olivier Thomann

on 2011-01-25 09:05:44 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2011-01-25 09:05:44 EST

Size: 1.55 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: search/org/eclipse/jdt/internal/core/search/processing/JobManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/processing/JobManager.java,v
>retrieving revision 1.103
>diff -u -r1.103 JobManager.java
>--- search/org/eclipse/jdt/internal/core/search/processing/JobManager.java	20 Dec 2010 10:21:13 -0000	1.103
>+++ search/org/eclipse/jdt/internal/core/search/processing/JobManager.java	25 Jan 2011 14:04:25 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 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
>@@ -226,7 +226,8 @@
> 								float lastWorked = 0;
> 								float totalWorked = 0;
> 								while ((awaitingJobsCount = awaitingJobsCount()) > 0) {
>-									if (subProgress != null && subProgress.isCanceled() && this.processingThread == null)
>+									if ((subProgress != null && subProgress.isCanceled())
>+											|| this.processingThread == null)
> 										throw new OperationCanceledException();
> 									IJob currentJob = currentJob();
> 									// currentJob can be null when jobs have been added to the queue but job manager is not enabled

Actions: View | Diff

Attachments on bug 327143: 185305 | 187517