--- a/src/hotspot/share/prims/jniCheck.cpp	Wed Jan 31 17:43:46 2018 -0800
+++ b/src/hotspot/share/prims/jniCheck.cpp	Thu Feb 01 13:30:53 2018 -0500
@@ -288,7 +288,7 @@
   /* validate the object being passed and then get its class */
   ASSERT_OOPS_ALLOWED;
   oop oopObj = jniCheck::validate_object(thr, obj);
-  if (!oopObj) {
+  if (oopObj == NULL) {
     ReportJNIFatalError(thr, fatal_null_object);
   }
   Klass* k_oop = oopObj->klass();
@@ -318,7 +318,7 @@
 {
   ASSERT_OOPS_ALLOWED;
   oop s = jniCheck::validate_object(thr, js);
-  if (!s || !java_lang_String::is_instance(s))
+  if ((s == NULL) || !java_lang_String::is_instance(s))
     ReportJNIFatalError(thr, fatal_non_string);
 }
 
@@ -461,14 +461,13 @@
 
 
 oop jniCheck::validate_object(JavaThread* thr, jobject obj) {
-    if (!obj)
-        return NULL;
-    ASSERT_OOPS_ALLOWED;
-    oop oopObj = jniCheck::validate_handle(thr, obj);
-    if (!oopObj) {
-      ReportJNIFatalError(thr, fatal_bad_ref_to_jni);
-    }
-    return oopObj;
+  if (obj == NULL) return NULL;
+  ASSERT_OOPS_ALLOWED;
+  oop oopObj = jniCheck::validate_handle(thr, obj);
+  if (oopObj == NULL) {
+    ReportJNIFatalError(thr, fatal_bad_ref_to_jni);
+  }
+  return oopObj;
 }
 
 // Warn if a class descriptor is in decorated form; class descriptors
@@ -492,7 +491,7 @@
 Klass* jniCheck::validate_class(JavaThread* thr, jclass clazz, bool allow_primitive) {
   ASSERT_OOPS_ALLOWED;
   oop mirror = jniCheck::validate_handle(thr, clazz);
-  if (!mirror) {
+  if (mirror == NULL) {
     ReportJNIFatalError(thr, fatal_received_null_class);
   }