diff options
Diffstat (limited to 'runtime/entrypoints/jni/jni_entrypoints.cc')
-rw-r--r-- | runtime/entrypoints/jni/jni_entrypoints.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/entrypoints/jni/jni_entrypoints.cc b/runtime/entrypoints/jni/jni_entrypoints.cc index 2752407750..a68eeebff8 100644 --- a/runtime/entrypoints/jni/jni_entrypoints.cc +++ b/runtime/entrypoints/jni/jni_entrypoints.cc @@ -34,15 +34,15 @@ extern "C" void* artFindNativeMethod(Thread* self) { Locks::mutator_lock_->AssertNotHeld(self); // We come here as Native. ScopedObjectAccess soa(self); - mirror::ArtMethod* method = self->GetCurrentMethod(NULL); - DCHECK(method != NULL); + mirror::ArtMethod* method = self->GetCurrentMethod(nullptr); + DCHECK(method != nullptr); - // Lookup symbol address for method, on failure we'll return NULL with an exception set, + // Lookup symbol address for method, on failure we'll return null with an exception set, // otherwise we return the address of the method we found. void* native_code = soa.Vm()->FindCodeForNativeMethod(method); - if (native_code == NULL) { + if (native_code == nullptr) { DCHECK(self->IsExceptionPending()); - return NULL; + return nullptr; } else { // Register so that future calls don't come here method->RegisterNative(native_code, false); |