Firebase cpp: Fixed compiler error due to unused variable

markchandler · a-maurice · commit 1f5c48160fd9 · 2019-11-15T17:46:12.000-08:00
PiperOrigin-RevId: 277669781
diff --git a/app/src/jobject_reference.cc b/app/src/jobject_reference.cc
@@ -101,9 +101,10 @@ void JObjectReference::Initialize(JavaVM* jvm, JNIEnv* env,
 }
 
 JavaVM* JObjectReference::GetJavaVM(JNIEnv* env) {
-  JavaVM* jvm;
+  FIREBASE_DEV_ASSERT(env);
+  JavaVM* jvm = nullptr;
   jint result = env->GetJavaVM(&jvm);
-  assert(result == JNI_OK);
+  FIREBASE_DEV_ASSERT(result == JNI_OK);
   return jvm;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,10 @@ void JObjectReference::Initialize(JavaVM* jvm, JNIEnv* env,`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`JavaVM* JObjectReference::GetJavaVM(JNIEnv* env) {`
`104`		`- JavaVM* jvm;`
	`104`	`+ FIREBASE_DEV_ASSERT(env);`
	`105`	`+ JavaVM* jvm = nullptr;`
`105`	`106`	`jint result = env->GetJavaVM(&jvm);`
`106`		`- assert(result == JNI_OK);`
	`107`	`+ FIREBASE_DEV_ASSERT(result == JNI_OK);`
`107`	`108`	`return jvm;`
`108`	`109`	`}`
`109`	`110`