diff --git a/java/rocksjni/options.cc b/java/rocksjni/options.cc index d5dc2f0676f..a6120f67dca 100644 --- a/java/rocksjni/options.cc +++ b/java/rocksjni/options.cc @@ -3917,7 +3917,7 @@ jlongArray Java_org_rocksdb_Options_tablePropertiesCollectorFactory( // exception thrown: OutOfMemoryError return nullptr; } - jlong* buf = env->GetLongArrayElements(retVal, NULL); + jlong* buf = env->GetLongArrayElements(retVal, nullptr); if (buf == nullptr) { // exception thrown: OutOfMemoryError return nullptr; @@ -3943,7 +3943,7 @@ void Java_org_rocksdb_Options_setTablePropertiesCollectorFactory( auto* opt = reinterpret_cast(jhandle); const jsize size = env->GetArrayLength(j_factory_handles); - jlong* buf = env->GetLongArrayElements(j_factory_handles, NULL); + jlong* buf = env->GetLongArrayElements(j_factory_handles, nullptr); if (buf == nullptr) { // exception thrown: OutOfMemoryError return; diff --git a/java/rocksjni/portal.h b/java/rocksjni/portal.h index 8a95b995e56..29b74733137 100644 --- a/java/rocksjni/portal.h +++ b/java/rocksjni/portal.h @@ -1689,7 +1689,7 @@ class JniUtil { } else if (env_rs == JNI_EDETACHED) { // current thread is not attached, attempt to attach const jint rs_attach = - jvm->AttachCurrentThread(reinterpret_cast(&env), NULL); + jvm->AttachCurrentThread(reinterpret_cast(&env), nullptr); if (rs_attach == JNI_OK) { *attached = JNI_TRUE; return env; diff --git a/java/rocksjni/ttl.cc b/java/rocksjni/ttl.cc index 8e23c10279b..4ab0854f502 100644 --- a/java/rocksjni/ttl.cc +++ b/java/rocksjni/ttl.cc @@ -145,7 +145,7 @@ jlongArray Java_org_rocksdb_TtlDB_openCF(JNIEnv* env, jclass, jlong jopt_handle, return jresults; } else { ROCKSDB_NAMESPACE::RocksDBExceptionJni::ThrowNew(env, s); - return NULL; + return nullptr; } }