From 2aa98ad07fd372e49f54da425a10899f9c66291c Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Wed, 16 Feb 2011 11:39:45 +0000 Subject: [PATCH] Bug 337284 - NPE in debug expression hover --- .../debug/ui/AbstractDsfDebugTextHover.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java index e1ac76a9da1..749ce88121d 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 Nokia Corporation and others. + * Copyright (c) 2009, 2011 Nokia Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -134,13 +134,15 @@ abstract public class AbstractDsfDebugTextHover extends AbstractDebugTextHover i try { GetExpressionValueQuery query = new GetExpressionValueQuery(frame, expression, dsfServicesTracker); DsfSession session = DsfSession.getSession(sessionId); - session.getExecutor().execute(query); - try { - FormattedValueDMData data = query.get(); - if (data != null) - return data.getFormattedValue(); - } catch (Exception e) { - } + if (session != null) { + session.getExecutor().execute(query); + try { + FormattedValueDMData data = query.get(); + if (data != null) + return data.getFormattedValue(); + } catch (Exception e) { + } + } } finally { dsfServicesTracker.dispose(); }