commit 79e9d2048c53f7c9906df60b7b2710f95099f90e
author Sarika Sinha <sarika.sinha@in.ibm.com> Wed Jul 15 10:20:06 2015 +0530
committer Sarika Sinha <sarika.sinha@in.ibm.com> Wed Jul 15 10:20:06 2015 +0530
tree c5c94bf2516540725707a51efeea19c392312e38
parent 10143ec4c90ce8afac7c40312042f9246794464f

Bug 472612 - NullPointerException in PopupInspectAction$2.close (64)

Change-Id: Id6ab3a4565b8a93123bb0cf1aae636ef4c734349

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/PopupInspectAction.java

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/PopupInspectAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/PopupInspectAction.java
index a9d73d2..d297879 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/PopupInspectAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/PopupInspectAction.java
@@ -60,7 +60,7 @@
         	@Override
 			public boolean close() {
         		boolean returnValue = super.close();
-        		if (fTextEditor != null && fSelectionBeforeEvaluation != null){
+				if (fTextEditor != null && fTextEditor.getSelectionProvider() != null && fSelectionBeforeEvaluation != null) {
         			fTextEditor.getSelectionProvider().setSelection(fSelectionBeforeEvaluation);
         			fTextEditor = null;
         			fSelectionBeforeEvaluation = null;