From b31476c87b596c43fe182bbd80eb2a6978651fb7 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Mon, 6 Apr 2015 15:27:41 -0400 Subject: [PATCH] Address minor review comments from review 41198 Change-Id: I8d5ddd9426babd0577e1f8fb5e4fdb6b7b7dfbe3 Signed-off-by: Marc Khouzam --- .../mi/service/command/output/ExprMetaGetVarInfo.java | 11 +++++++---- .../cdt/dsf/mi/service/command/output/MIVar.java | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/ExprMetaGetVarInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/ExprMetaGetVarInfo.java index 7eabadbe454..d1f9ab3961f 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/ExprMetaGetVarInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/ExprMetaGetVarInfo.java @@ -15,7 +15,6 @@ package org.eclipse.cdt.dsf.mi.service.command.output; import org.eclipse.cdt.dsf.debug.service.command.ICommand; import org.eclipse.cdt.dsf.debug.service.command.ICommandResult; import org.eclipse.cdt.dsf.gdb.GDBTypeParser.GDBType; -import org.eclipse.cdt.dsf.mi.service.MIVariableManager; import org.eclipse.cdt.dsf.mi.service.MIVariableManager.MIVariableObject; import org.eclipse.cdt.dsf.mi.service.command.commands.ExprMetaGetChildCount; @@ -74,7 +73,7 @@ public class ExprMetaGetVarInfo implements ICommandResult { /** * @since 4.7 */ - public ExprMetaGetVarInfo(String e, MIVariableManager.MIVariableObject varObj) + public ExprMetaGetVarInfo(String e, MIVariableObject varObj) { // We only provide the hint here. It will be used for hasChildren() // To obtain the correct number of children, the user should use @@ -82,10 +81,14 @@ public class ExprMetaGetVarInfo implements ICommandResult { this(e, varObj, varObj.getNumChildrenHint()); } - /** Return raw MI fields for this variable. + /** + * Return raw MI fields for this variable or null if + * no available. * @since 4.7 */ - public MITuple getRawFields() { return varObj.getRawFields(); } + public MITuple getRawFields() { + return varObj != null ? varObj.getRawFields() : null; + } public String getExpr() { return expression; } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIVar.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIVar.java index c99a2c0537e..4748e3a1b06 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIVar.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIVar.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. + * Copyright (c) 2000, 2015 QNX Software Systems 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