Index: webrtc/api/java/jni/jni_helpers.cc |
diff --git a/webrtc/api/java/jni/jni_helpers.cc b/webrtc/api/java/jni/jni_helpers.cc |
index f42abc703e6ce613e47837a9107eff7eee78dd09..052dcf9a8960b255af8950a89d9434650328d8a4 100644 |
--- a/webrtc/api/java/jni/jni_helpers.cc |
+++ b/webrtc/api/java/jni/jni_helpers.cc |
@@ -176,7 +176,13 @@ jclass GetObjectClass(JNIEnv* jni, jobject object) { |
jobject GetObjectField(JNIEnv* jni, jobject object, jfieldID id) { |
jobject o = jni->GetObjectField(object, id); |
CHECK_EXCEPTION(jni) << "error during GetObjectField"; |
pthatcher1
2016/04/11 19:39:29
Can't you replace this with GetNullableObjectField
Taylor Brandstetter
2016/04/11 23:13:38
True.
|
- RTC_CHECK(o) << "GetObjectField returned NULL"; |
+ RTC_CHECK(!IsNull(jni, o)) << "GetObjectField returned NULL"; |
+ return o; |
+} |
+ |
+jobject GetNullableObjectField(JNIEnv* jni, jobject object, jfieldID id) { |
+ jobject o = jni->GetObjectField(object, id); |
+ CHECK_EXCEPTION(jni) << "error during GetObjectField"; |
return o; |
} |