Fix jniThrowRuntimeException for C callers, add jniThrowNullPointerException.

...and switch all NPE throwers over to the helper.

1 files changed, 3 insertions, 4 deletions

diff --git a/luni/src/main/native/java_net_InetAddress.cpp b/luni/src/main/native/java_net_InetAddress.cpp
index 63053a8..04c18af 100644
--- a/luni/src/main/native/java_net_InetAddress.cpp
+++ b/luni/src/main/native/java_net_InetAddress.cpp
@@ -143,8 +143,7 @@ static jobjectArray InetAddress_getaddrinfoImpl(JNIEnv* env, const char* name) {
         }
     } else if (result == EAI_SYSTEM && errno == EACCES) {
         /* No permission to use network */
-        jniThrowException(
-            env, "java/lang/SecurityException",
+        jniThrowException(env, "java/lang/SecurityException",
             "Permission denied (maybe missing INTERNET permission)");
     } else {
         jniThrowException(env, "java/net/UnknownHostException",
@@ -160,7 +159,7 @@ static jobjectArray InetAddress_getaddrinfoImpl(JNIEnv* env, const char* name) {
 
 jobjectArray InetAddress_getaddrinfo(JNIEnv* env, jobject obj, jstring javaName) {
     if (javaName == NULL) {
-        jniThrowException(env, "java/lang/NullPointerException", NULL);
+        jniThrowNullPointerException(env, NULL);
         return NULL;
     }
     const char* name = env->GetStringUTFChars(javaName, NULL);
@@ -182,7 +181,7 @@ static jstring InetAddress_getnameinfo(JNIEnv* env, jobject obj,
                                          jbyteArray javaAddress)
 {
     if (javaAddress == NULL) {
-        jniThrowException(env, "java/lang/NullPointerException", NULL);
+        jniThrowNullPointerException(env, NULL);
         return NULL;
     }