From 1d8d0320a93fa80517ec5e9bbcfbcf9ee950b836 Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Fri, 1 Aug 2008 10:57:21 +0000 Subject: [PATCH] Bug 242335 - Eclipse Ganymede hangs on startup --- .../cdt/internal/ui/editor/AbstractCModelOutlinePage.java | 6 ++++-- .../src/org/eclipse/cdt/internal/ui/editor/CEditor.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java index 4cceee2560c..d3d7d5658aa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java @@ -324,9 +324,11 @@ public abstract class AbstractCModelOutlinePage extends Page implements IContent int offset = editorSelection.getOffset(); - ICElement editorElement; + ICElement editorElement= null; try { - editorElement = fInput.getElementAtOffset(offset); + if (fInput.isStructureKnown() && fInput.isConsistent()) { + editorElement = fInput.getElementAtOffset(offset); + } } catch (CModelException e) { return; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java index 2cd821ba6b8..b06b5b3b3a7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java @@ -1716,7 +1716,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC ((IWorkingCopy) unit).reconcile(); } return unit.getElementAtOffset(offset); - } else if (unit.isConsistent()) { + } else if (unit.isStructureKnown() && unit.isConsistent()) { return unit.getElementAtOffset(offset); } } catch (CModelException x) {