From a31dcc6d9169a1136ea34cf5584e30dd93628a30 Mon Sep 17 00:00:00 2001
From: Ken Ryall
Date: Thu, 22 Apr 2010 15:47:30 +0000
Subject: Fix NPE.

---
 .../ui/CSourceNotFoundDescriptionFactory.java         | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'dsf/org.eclipse.cdt.dsf.ui')

diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java
index a3dbecf4338..7776e506f02 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java
@@ -60,13 +60,18 @@ public class CSourceNotFoundDescriptionFactory implements IAdapterFactory {
 		                        tracker.dispose();
 		                    }
 		                };	                
-		                DsfSession.getSession(frameDMC.getSessionId()).getExecutor().execute(query);
-		                try {
-		                	IFrameDMData dmData = query.get();
-							return getFrameDescription(dmData);
-						} catch (Exception e) {
-							return frameDMC.toString();
-						}
+		                DsfSession session = DsfSession.getSession(frameDMC.getSessionId());
+		                if (session != null && session.getExecutor() != null)
+		                {
+			                session.getExecutor().execute(query);
+			                try {
+			                	IFrameDMData dmData = query.get();
+								return getFrameDescription(dmData);
+							} catch (Exception e) {
+								return frameDMC.toString();
+							}
+		                }
+		                return frameDMC.toString();
 				}};
 		}
 		return null;
-- 
cgit v1.2.1