summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--runtime/jdwp/object_registry.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/jdwp/object_registry.cc b/runtime/jdwp/object_registry.cc
index e415c3d1cd..99a005df21 100644
--- a/runtime/jdwp/object_registry.cc
+++ b/runtime/jdwp/object_registry.cc
@@ -49,6 +49,8 @@ JDWP::ObjectId ObjectRegistry::InternalAdd(mirror::Object* o) {
}
Thread* const self = Thread::Current();
+ self->AssertNoPendingException();
+
StackHandleScope<1> hs(self);
Handle<mirror::Object> obj_h(hs.NewHandle(o));