Skip to content

Fix JniCallback null check to test the NewGlobalRef result #15063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sanjays2402 wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −2
Open

Fix JniCallback null check to test the NewGlobalRef result #15063

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions java/rocksjni/jnicallback.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
#include "rocksjni/portal.h"

namespace ROCKSDB_NAMESPACE {
JniCallback::JniCallback(JNIEnv* env, jobject jcallback_obj) {
JniCallback::JniCallback(JNIEnv* env, jobject jcallback_obj)
: m_jvm(nullptr), m_jcallback_obj(nullptr) {
// Note: jcallback_obj may be accessed by multiple threads,
// so we ref the jvm not the env
const jint rs = env->GetJavaVM(&m_jvm);
Expand All @@ -26,7 +27,7 @@ JniCallback::JniCallback(JNIEnv* env, jobject jcallback_obj) {
// across multiple method calls, so we create a global ref
assert(jcallback_obj != nullptr);
m_jcallback_obj = env->NewGlobalRef(jcallback_obj);
if (jcallback_obj == nullptr) {
if (m_jcallback_obj == nullptr) {
// exception thrown: OutOfMemoryError
return;
}
Expand All @@ -41,6 +42,12 @@ void JniCallback::releaseJniEnv(jboolean& attached) const {
}

JniCallback::~JniCallback() {
if (m_jvm == nullptr) {
// construction failed before the JavaVM was obtained,
// so there is nothing to release
return;
}

jboolean attached_thread = JNI_FALSE;
JNIEnv* env = getJniEnv(&attached_thread);
assert(env != nullptr);
Expand Down