From 927ed83c4e88c12212fee84cac5831db55411a8e Mon Sep 17 00:00:00 2001 From: David Inglis Date: Thu, 6 Nov 2003 18:53:26 +0000 Subject: [PATCH] further imporovements for https://bugs.eclipse.org/bugs/show_bug.cgi?id=45736 --- .../internal/core/model/DeltaProcessor.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java index ac19437a3ab..6645bf2a08e 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java @@ -61,12 +61,15 @@ public class DeltaProcessor { ICElement parent = manager.create(resource.getParent()); // Probably it was deleted, find it if (parent instanceof IParent) { - ICElement[] children = ((CElement)parent).getElementInfo().getChildren(); - for (int i = 0; i < children.length; i++) { - IResource res = children[i].getResource(); - if (res != null && res.equals(resource)) { - celement = children[i]; - break; + ICElement[] children; + if ( CModelManager.getDefault().peekAtInfo(parent) != null ) { + children = ((CElement)parent).getElementInfo().getChildren(); + for (int i = 0; i < children.length; i++) { + IResource res = children[i].getResource(); + if (res != null && res.equals(resource)) { + celement = children[i]; + break; + } } } // BUG 36424: @@ -380,9 +383,12 @@ public class DeltaProcessor { elementDelta.addResourceDelta(delta); } if (parent instanceof CContainer) { - CElementInfo info = ((CContainer)parent).getElementInfo(); - if (info instanceof CContainerInfo) { - ((CContainerInfo)info).setNonCResources(null); + // if info not created yet no need to null NonCResources... + if (CModelManager.getDefault().peekAtInfo(parent) != null) { + CElementInfo info = ((CContainer)parent).getElementInfo(); + if (info instanceof CContainerInfo) { + ((CContainerInfo)info).setNonCResources(null); + } } } }