From 97771a48796afc7531fa642bdb60cbf121325cc3 Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Wed, 29 Jun 2011 15:06:48 +0200 Subject: [PATCH] Bug 348573 - Deadlock between BinaryRunner and project model serializing lock --- .../model/org/eclipse/cdt/internal/core/model/CProject.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java index 1b88300c7b8..758a83019a8 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProject.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 QNX Software Systems and others. + * Copyright (c) 2000, 2011 QNX Software Systems 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 @@ -723,6 +723,7 @@ public class CProject extends Openable implements ICProject { @Override protected void closing(Object info) throws CModelException { if (info instanceof CProjectInfo) { + CModelManager.getDefault().removeBinaryRunner(this); CProjectInfo pinfo = (CProjectInfo)info; if (pinfo.vBin != null) { pinfo.vBin.close(); @@ -731,7 +732,6 @@ public class CProject extends Openable implements ICProject { pinfo.vLib.close(); } pinfo.resetCaches(); - CModelManager.getDefault().removeBinaryRunner(this); } super.closing(info); }