Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Inglis2004-01-12 10:48:58 -0500
committerDavid Inglis2004-01-12 10:48:58 -0500
commitd9c8a82d8937c6ce98c93ee183a4f1bdb3e66267 (patch)
treefec89a0f9b6e90b18a9138f4a2e5cfdaa308a033
parentb2037c5e73f254f6420705c7bdd7df0535e1c5ba (diff)
downloadorg.eclipse.cdt-d9c8a82d8937c6ce98c93ee183a4f1bdb3e66267.tar.gz
org.eclipse.cdt-d9c8a82d8937c6ce98c93ee183a4f1bdb3e66267.tar.xz
org.eclipse.cdt-d9c8a82d8937c6ce98c93ee183a4f1bdb3e66267.zip
fixed bug # 49851
-rw-r--r--core/org.eclipse.cdt.core/ChangeLog9
-rw-r--r--core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java4
2 files changed, 11 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index 396edb3dfbf..8c3186c1107 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,3 +1,12 @@
+2004-1-5 David Inglis
+
+ PR 49851
+ Fixed deadlock when binary parser was changed while binary runner was running
+ for that project.
+
+ * model/org/eclipse/cdt/internal/core/model/CModelManager.java
+
+
2003-12-16 Alain Magloire
PR 48921.
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
index e2d9d93794b..080f830872b 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
@@ -342,7 +342,7 @@ public class CModelManager implements IResourceChangeListener {
CProjectInfo info = (CProjectInfo)peekAtInfo(cproject);
if (info != null && info.vBin != null) {
if (peekAtInfo(info.vBin) != null) {
- IBinary[] bins = info.vBin.getBinaries();
+ ICElement[] bins = info.getChildren();
for (int i = 0; i < bins.length; i++) {
if (celement.getPath().isPrefixOf(bins[i].getPath())) {
CElementDelta delta = new CElementDelta(getCModel());
@@ -355,7 +355,7 @@ public class CModelManager implements IResourceChangeListener {
}
if (info != null && info.vLib != null) {
if (peekAtInfo(info.vLib) != null) {
- IArchive[] ars = info.vLib.getArchives();
+ ICElement[] ars = info.vLib.getChildren();
for (int i = 0; i < ars.length; i++) {
if (celement.getPath().isPrefixOf(ars[i].getPath())) {
CElementDelta delta = new CElementDelta(getCModel());

Back to the top