From 67ad3bb4b0440e53af3374bb9b568f34c5a366b4 Mon Sep 17 00:00:00 2001
From: John Camelon <jcamelon@ca.ibm.com>
Date: Thu, 17 Jun 2004 17:29:12 +0000
Subject: [PATCH] Fixed ClassCastException in CompleteParseASTTest.

---
 .../cdt/core/parser/tests/CompleteParseBaseTest.java       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParseBaseTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParseBaseTest.java
index 0b177ea10d3..16e644d5b9d 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParseBaseTest.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/CompleteParseBaseTest.java
@@ -516,7 +516,9 @@ public class CompleteParseBaseTest extends TestCase
         
         protected CodeScope getCurrentCodeScope()
         {
-        	return (CodeScope)scopes.peek();
+        	if( scopes.peek() instanceof CodeScope )
+        		return (CodeScope)scopes.peek();
+        	return null;
         }
         
         protected Scope popScope()
@@ -714,7 +716,8 @@ public class CompleteParseBaseTest extends TestCase
 		 */
 		public void exitCodeBlock(IASTCodeScope scope) {
 			popScope();
-			getCurrentCodeScope().addNewScope(scope);
+			if( getCurrentCodeScope() != null )
+				getCurrentCodeScope().addNewScope(scope);
 		}
 
         /* (non-Javadoc)