From 7d596aa92fdef913ab76ba3226dec767226d8e1a Mon Sep 17 00:00:00 2001
From: axel <aegges@web.de>
Date: Mon, 13 May 2013 23:06:24 +0200
Subject: [PATCH] Bug 407506 - avoid NPE

Change-Id: Iddc1da83ee3bf1f74549d165d08056ddeef93a97
Reviewed-on: https://git.eclipse.org/r/12766
Reviewed-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
IP-Clean: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Tested-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
---
 .../core/dom/rewrite/commenthandler/ASTCommenter.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/ASTCommenter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/ASTCommenter.java
index f78c870b83f..b891e544825 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/ASTCommenter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/commenthandler/ASTCommenter.java
@@ -83,8 +83,12 @@ public class ASTCommenter {
 		}
 
 		private boolean isCommentOnSameLine(IASTNode node) {
-			return commentNodeLocation.getStartingLineNumber() ==
-					node.getFileLocation().getEndingLineNumber();
+			if (node.getFileLocation() == null) {
+				return false;
+			} else {
+				return commentNodeLocation.getStartingLineNumber() == node.getFileLocation()
+						.getEndingLineNumber();
+			}
 		}
 
 		@Override