mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 18:26:01 +02:00
Code Issues Wiki Activity

Bug 296006 nullify cached underlying Expression Variable if it's unable to provide value string

Browse source
This commit is contained in:
James Blackburn 2009-11-24 15:12:35 +00:00
parent ca19a9fd59
commit 3d3b6c4b4c
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Expression.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2006 QNX Software Systems and others. * Copyright (c) 2000, 2009 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -105,11 +105,18 @@ public class Expression extends CObject implements ICDIExpression {
mgr.deleteVariable(fVariable); mgr.deleteVariable(fVariable);
fVariable = null; fVariable = null;
} }
if (fVariable == null)
{ // Reuse the variable so we don't have to ask gdb to create another one. Bug 150565.
fVariable = mgr.createVariable((StackFrame)context, getExpressionText());
}
fContext = context; fContext = context;
if (fVariable != null) {
// Reuse the variable so we don't have to ask gdb to create another one. Bug 150565.
try {
// It's possible this variable is no longer valid... (Bug 296006)
fVariable.getValue().getValueString();
} catch (CDIException e) {
fVariable = null;
}
}
if (fVariable == null)
fVariable = mgr.createVariable((StackFrame)context, getExpressionText());
return fVariable.getValue(); return fVariable.getValue();
} }
@ -122,6 +129,7 @@ public class Expression extends CObject implements ICDIExpression {
mgr.destroyExpressions((Target)getTarget(), new Expression[] {this}); mgr.destroyExpressions((Target)getTarget(), new Expression[] {this});
if (fVariable != null) if (fVariable != null)
mgr.deleteVariable(fVariable); mgr.deleteVariable(fVariable);
fVariable = null;
} }
} }