Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Ryall2010-04-22 15:47:30 +0000
committerKen Ryall2010-04-22 15:47:30 +0000
commita31dcc6d9169a1136ea34cf5584e30dd93628a30 (patch)
tree7fad38da9d34c8dc297c16c84bcff7486e0ec072 /dsf/org.eclipse.cdt.dsf.ui
parent077917c1f5c4c5626193059d944b30ccf0482c02 (diff)
downloadorg.eclipse.cdt-a31dcc6d9169a1136ea34cf5584e30dd93628a30.tar.gz
org.eclipse.cdt-a31dcc6d9169a1136ea34cf5584e30dd93628a30.tar.xz
org.eclipse.cdt-a31dcc6d9169a1136ea34cf5584e30dd93628a30.zip
Fix NPE.
Diffstat (limited to 'dsf/org.eclipse.cdt.dsf.ui')
-rw-r--r--dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java19
1 files changed, 12 insertions, 7 deletions
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;

Back to the top