From 99829d9cdd1f3983ecee4bb68c519a263672f0aa Mon Sep 17 00:00:00 2001
From: dfuchs <unknown>
Date: Tue, 1 Sep 2015 15:34:58 +0200
Subject: [PATCH] 8064470: JNI exception pending in
 jdk/src/java/base/unix/native/libjava/FileDescriptor_md.c Reviewed-by: alanb,
 chegar, dfuchs Contributed-by: vyom.tewari@oracle.com

---
 src/solaris/native/java/io/FileDescriptor_md.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/solaris/native/java/io/FileDescriptor_md.c b/src/solaris/native/java/io/FileDescriptor_md.c
index 7147a14c5..ba353cba2 100644
--- a/src/solaris/native/java/io/FileDescriptor_md.c
+++ b/src/solaris/native/java/io/FileDescriptor_md.c
@@ -23,9 +23,11 @@
  * questions.
  */
 
+#include "jni.h"
+#include "jni_util.h"
 #include "jvm.h"
-#include "io_util_md.h"
 
+#include "io_util_md.h"
 #include "java_io_FileDescriptor.h"
 
 /*******************************************************************/
@@ -41,7 +43,7 @@ jfieldID IO_fd_fdID;
 
 JNIEXPORT void JNICALL
 Java_java_io_FileDescriptor_initIDs(JNIEnv *env, jclass fdClass) {
-    IO_fd_fdID = (*env)->GetFieldID(env, fdClass, "fd", "I");
+    CHECK_NULL(IO_fd_fdID = (*env)->GetFieldID(env, fdClass, "fd", "I"));
 }
 
 /**************************************************************
-- 
GitLab