Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDennis Wagelaar2016-08-19 09:05:14 -0400
committerDennis Wagelaar2016-08-19 09:09:13 -0400
commit420327073fe40bbc473ef2c49e3da43f4ef2ca55 (patch)
tree8e992ef221ee703cf04abce938d947f309ecba0f /plugins/org.eclipse.m2m.atl.emftvm
parente6ad06ec05911ec52857fc7084d9daf358fc5b1f (diff)
downloadorg.eclipse.atl-420327073fe40bbc473ef2c49e3da43f4ef2ca55.tar.gz
org.eclipse.atl-420327073fe40bbc473ef2c49e3da43f4ef2ca55.tar.xz
org.eclipse.atl-420327073fe40bbc473ef2c49e3da43f4ef2ca55.zip
499982: Evaluating VMException.toString() may throw new VMException
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=499982
Diffstat (limited to 'plugins/org.eclipse.m2m.atl.emftvm')
-rw-r--r--plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/StackFrame.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/StackFrame.java b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/StackFrame.java
index 841ed601..867af7cf 100644
--- a/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/StackFrame.java
+++ b/plugins/org.eclipse.m2m.atl.emftvm/src/org/eclipse/m2m/atl/emftvm/util/StackFrame.java
@@ -315,14 +315,22 @@ public final class StackFrame {
if (lv.getSlot() == slot && lv.getStartInstructionIndex() <= loc && lv.getEndInstructionIndex() >= loc) {
sb.append(lv.toString());
sb.append(" = ");
- sb.append(EMFTVMUtil.toPrettyString(locals[slot], getEnv()));
+ try {
+ sb.append(EMFTVMUtil.toPrettyString(locals[slot], getEnv()));
+ } catch (VMException e) {
+ sb.append("<VMException>");
+ }
break;
}
}
}
sb.append(']');
} else {
- sb.append(EMFTVMUtil.toPrettyString(locals, getEnv()));
+ try {
+ sb.append(EMFTVMUtil.toPrettyString(locals, getEnv()));
+ } catch (VMException e) {
+ sb.append("<VMException>");
+ }
}
final StackFrame parent = getParent();
if (parent != null) {

Back to the top