Use jniThrowException instead of FindClass/ThrowNew.

Always use our best-of-breed code for throwing exceptions. The remaining
callers of Throw have good reason, and the only caller of ThrowNew is
now JNIHelp.c (jniThrowException) itself.

2 files changed, 4 insertions, 37 deletions

diff --git a/luni/src/main/native/java_net_InetAddress.cpp b/luni/src/main/native/java_net_InetAddress.cpp
index 243b63d..4e58a1f 100644
--- a/luni/src/main/native/java_net_InetAddress.cpp
+++ b/luni/src/main/native/java_net_InetAddress.cpp
@@ -47,19 +47,6 @@ static jstring InetAddress_gethostname(JNIEnv* env, jobject obj)
     }
 }
 
-static void throwNullPointerException(JNIEnv* env)
-{
-    const char* className = "java/lang/NullPointerException";
-
-    jclass exClass = env->FindClass(className);
-
-    if (exClass == NULL) {
-        LOGE("Unable to find class %s", className);
-    } else {
-        env->ThrowNew(exClass, NULL);
-    }
-}
-
 #if LOG_DNS
 static void logIpString(struct addrinfo* ai, const char* name)
 {
@@ -207,7 +194,7 @@ jobjectArray InetAddress_getallbyname(JNIEnv* env, jobject obj,
                                       jboolean preferIPv4Stack)
 {
     if (javaName == NULL) {
-        throwNullPointerException(env);
+        jniThrowException(env, "java/lang/NullPointerException", NULL);
         return NULL;
     }
 
@@ -246,7 +233,7 @@ static jstring InetAddress_gethostbyaddr(JNIEnv* env, jobject obj,
                                          jbyteArray javaAddress)
 {
     if (javaAddress == NULL) {
-        throwNullPointerException(env);
+        jniThrowException(env, "java/lang/NullPointerException", NULL);
         return NULL;
     }
 
diff --git a/luni/src/main/native/java_net_NetworkInterface.c b/luni/src/main/native/java_net_NetworkInterface.c
index c659ae1..7fdf4fe 100644
--- a/luni/src/main/native/java_net_NetworkInterface.c
+++ b/luni/src/main/native/java_net_NetworkInterface.c
@@ -34,27 +34,7 @@
  * Throws an IOException with the given message.
  */
 static void throwSocketException(JNIEnv *env, const char *message) {
-    jclass exClass = (*env)->FindClass(env, "java/net/SocketException");
-
-    if(exClass == NULL) {
-        LOGE("Unable to find class java/net/SocketException");
-    } else {
-        (*env)->ThrowNew(env, exClass, message);
-    }
-}
-
-
-/**
- * Throws a NullPointerException.
- */
-static void throwNullPointerException(JNIEnv *env) {
-    jclass exClass = (*env)->FindClass(env, "java/lang/NullPointerException");
-
-    if(exClass == NULL) {
-        LOGE("Unable to find class java/lang/NullPointerException");
-    } else {
-        (*env)->ThrowNew(env, exClass, NULL);
-    }
+    jniThrowException(env, "java/net/SocketException", message);
 }
 
 /**
@@ -242,7 +222,7 @@ static int structInToJavaAddress(
         JNIEnv *env, struct in_addr *address, jbyteArray java_address) {
 
     if (java_address == NULL) {
-        throwNullPointerException(env);
+        jniThrowException(env, "java/lang/NullPointerException", NULL);
         return -1;
     }