From 41740da7ba1eb796124c03de146244525157212e Mon Sep 17 00:00:00 2001 From: John Camelon Date: Tue, 5 Jul 2005 14:19:31 +0000 Subject: [PATCH] Fixed Bug 102730 - [NPE] in CPPASTAmbiguity#accept(CPPASTAmbiguity) line: 77 when indexing wxWidgets --- .../cdt/internal/core/dom/parser/c/CASTAmbiguity.java | 9 ++++++--- .../internal/core/dom/parser/cpp/CPPASTAmbiguity.java | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguity.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguity.java index 9707ccd51fe..a361f547d7f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguity.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguity.java @@ -72,9 +72,12 @@ public abstract class CASTAmbiguity extends CASTNode { if( b == null || b instanceof IProblemBinding ) ++issues[i]; IScope scope = CPPVisitor.getContainingScope( names[j] ); - try { - scope.flushCache(); - } catch (DOMException e) { + if( scope != null ) + { + try { + scope.flushCache(); + } catch (DOMException e) { + } } } catch( Throwable t ) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguity.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguity.java index 67cbce9ce19..dad275c104a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguity.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguity.java @@ -73,9 +73,12 @@ public abstract class CPPASTAmbiguity extends CPPASTNode { } if (names.length > 0) { IScope scope = CPPVisitor.getContainingScope(names[0]); - try { - scope.flushCache(); - } catch (DOMException de) {} + if( scope != null ) + { + try { + scope.flushCache(); + } catch (DOMException de) {} + } } } int bestIndex = 0;