summaryrefslogtreecommitdiff
path: root/runtime/reflection.cc
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2015-03-09 10:15:14 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-03-09 10:15:14 +0000
commita60bb12ed88a0f11fb6a8444964ea55af2054824 (patch)
tree8eabb49a208c04b219e5a1b037254647498d9d1d /runtime/reflection.cc
parentf20cc35c8e37a515fc19ca554b56ee78dfa7cc82 (diff)
parent5c9d8f0d2948c2b4fe4258f96e3598ad5b8fa23b (diff)
am 5c9d8f0d: Merge "Compute the right catch location for the debugger."
* commit '5c9d8f0d2948c2b4fe4258f96e3598ad5b8fa23b': Compute the right catch location for the debugger.
Diffstat (limited to 'runtime/reflection.cc')
-rw-r--r--runtime/reflection.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/reflection.cc b/runtime/reflection.cc
index 2aeb92d49a..4acd07fb18 100644
--- a/runtime/reflection.cc
+++ b/runtime/reflection.cc
@@ -366,7 +366,7 @@ static void CheckMethodArguments(JavaVMExt* vm, mirror::ArtMethod* m, uint32_t*
CHECK(self->IsExceptionPending());
LOG(ERROR) << "Internal error: unresolvable type for argument type in JNI invoke: "
<< h_m->GetTypeDescriptorFromTypeIdx(type_idx) << "\n"
- << self->GetException(nullptr)->Dump();
+ << self->GetException()->Dump();
self->ClearException();
++error_count;
} else if (!param_type->IsPrimitive()) {