Attachment 166018 Details for Bug 293995 – Workaround for JDT/UI

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

[patch] Workaround for JDT/UI

293995_patch.txt (text/plain), 1.97 KB, created by Markus Keller

on 2010-04-25 10:48:38 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Keller

Created: 2010-04-25 10:48:38 EDT

Size: 1.97 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui
>Index: ui/org/eclipse/jdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java,v
>retrieving revision 1.11
>diff -u -r1.11 ChangeCorrectionProposal.java
>--- ui/org/eclipse/jdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java	30 Sep 2009 07:30:11 -0000	1.11
>+++ ui/org/eclipse/jdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java	25 Apr 2010 13:25:13 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2010 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
>@@ -24,6 +24,7 @@
> import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.core.runtime.Status;
> 
>+import org.eclipse.jface.util.Util;
> import org.eclipse.jface.viewers.StyledCellLabelProvider;
> import org.eclipse.jface.viewers.StyledString;
> 
>@@ -297,8 +298,18 @@
> 	 * @throws CoreException thrown when the change could not be created
> 	 */
> 	public synchronized final Change getChange() throws CoreException {
>-		if (fChange == null) {
>-			fChange= createChange();
>+		if (Util.isGtk()) {
>+			// workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=293995 :
>+			// [Widgets] Deadlock while UI thread displaying/computing a change proposal and non-UI thread creating image
>+			if (fChange == null) {
>+				fChange= createChange();
>+			}
>+		} else {
>+			synchronized (this) {
>+				if (fChange == null) {
>+					fChange= createChange();
>+				}
>+			}
> 		}
> 		return fChange;
> 	}

Actions: View | Diff

Attachments on bug 293995: 166018 | 166061