From a9ca46d10061b15f8ac973f20fdd287083935896 Mon Sep 17 00:00:00 2001 From: Pawel Piech Date: Wed, 19 Dec 2007 19:45:04 +0000 Subject: [PATCH] [212938] Fix for NPE as a result of a detail pane job returning null status. --- .../dsf/debug/ui/viewmodel/modules/ModuleDetailPane.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/modules/ModuleDetailPane.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/modules/ModuleDetailPane.java index 2ce7ff77992..ce0a8a91172 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/modules/ModuleDetailPane.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/modules/ModuleDetailPane.java @@ -394,9 +394,9 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, dmc = DMContexts.getAncestorOfType(vmcdmc, IModuleDMContext.class); } - if (dmc == null) return null; + if (dmc == null) return Status.OK_STATUS; DsfSession session = DsfSession.getSession(dmc.getSessionId()); - if (session == null) return null; + if (session == null) return Status.OK_STATUS; /* * Create the query to write the value to the service. Note: no need to @@ -415,9 +415,9 @@ public class ModuleDetailPane extends AbstractDetailPane implements IAdaptable, detailComputed(getModuleDetail((IModuleDMData) query.get())); } catch (InterruptedException e) { assert false; - return null; + return Status.OK_STATUS; } catch (ExecutionException e) { - return null; + return Status.OK_STATUS; } return Status.OK_STATUS; }