From b2b2a109f5623612639f1b30207ac482c9d190c3 Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Mon, 21 Oct 2013 10:15:46 -0700
Subject: [PATCH] Fixed a potential NPE.

---
 .../internal/ui/refactoring/includes/IncludeOrganizer.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java
index ad3d44f23fc..3d7bf8df919 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java
@@ -1004,8 +1004,10 @@ public class IncludeOrganizer {
 	    		for (IASTName name : declarations) {
 	    			if (name instanceof IAdaptable) {
 	    				IIndexName indexName = (IIndexName) ((IAdaptable) name).getAdapter(IIndexName.class);
-	    				indexNames = Arrays.copyOf(indexNames, indexNames.length + 1);
-	    				indexNames[indexNames.length - 1] = indexName;
+	    				if (indexName != null) {
+		    				indexNames = Arrays.copyOf(indexNames, indexNames.length + 1);
+		    				indexNames[indexNames.length - 1] = indexName;
+	    				}
 	    			}
 	    		}
 			} else if (allowDeclarations || binding instanceof IFunction || binding instanceof IVariable) {