diff options
| author | Sebastien Hertz <shertz@google.com> | 2015-02-24 17:47:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-24 17:47:39 +0000 |
| commit | 354d58ba776866ea7b1c71f0d0848d5aaa013ae3 (patch) | |
| tree | 95b9dcd141f6de1dd05c2008f46a3835f6308c7c /runtime | |
| parent | 91d6743016a513bbe8b288923aaa46a075aed133 (diff) | |
| parent | e4266c511ffe6a1ed472292bea06881dcbf06f7a (diff) | |
| download | art-354d58ba776866ea7b1c71f0d0848d5aaa013ae3.tar.gz art-354d58ba776866ea7b1c71f0d0848d5aaa013ae3.tar.bz2 art-354d58ba776866ea7b1c71f0d0848d5aaa013ae3.zip | |
Merge "JDWP: assert no pending exception when using JNI"
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/jdwp/object_registry.cc | 2 |
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)); |