From 689000d0423e07c328793b58d42e1794def74280 Mon Sep 17 00:00:00 2001
From: John Camelon <jcamelon@ca.ibm.com>
Date: Fri, 18 Feb 2005 21:09:54 +0000
Subject: [PATCH] Patch for Devin Steffler. Fix NPE in DOMAST View when run
 headless.

---
 .../src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java
index 5e9624227ea..07f17c28057 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java
@@ -712,10 +712,11 @@ public class DOMAST extends ViewPart {
    private IEditorPart getActiveEditor() {
    	IEditorPart editor = null;
    	
-   	if (getSite().getPage().isEditorAreaVisible()) {
+   	if (getSite().getPage().isEditorAreaVisible() &&
+	   	getSite().getPage().getActiveEditor() != null) {
 	   	editor = getSite().getPage().getActiveEditor();
 	    part = editor;
-	    lang = lang = getLanguageFromFile(((CEditor)editor).getInputFile());
+	    lang = getLanguageFromFile(((CEditor)editor).getInputFile());
    	}
 
    	return editor;