1 files changed, 5 insertions, 8 deletions
diff --git a/luni/src/main/native/UCharacter.cpp b/luni/src/main/native/UCharacter.cpp
index 136f58c..09bb90d 100644
--- a/luni/src/main/native/UCharacter.cpp
+++ b/luni/src/main/native/UCharacter.cpp
@@ -156,15 +156,12 @@ static jboolean isLowerCaseImpl(JNIEnv*, jclass, jint codePoint) {
     return u_islower(codePoint);
 }
 
-static int forNameImpl(JNIEnv* env, jclass, jstring blockName) {
-    if (blockName == NULL) {
-        jniThrowNullPointerException(env, NULL);
-        return -1;
+static int forNameImpl(JNIEnv* env, jclass, jstring javaBlockName) {
+    ScopedUtfChars blockName(env, javaBlockName);
+    if (blockName.c_str() == NULL) {
+        return 0;
     }
-    const char* bName = env->GetStringUTFChars(blockName, NULL);
-    int result = u_getPropertyValueEnum(UCHAR_BLOCK, bName);
-    env->ReleaseStringUTFChars(blockName, bName);
-    return result;
+    return u_getPropertyValueEnum(UCHAR_BLOCK, blockName.c_str());
 }
 
 static int ofImpl(JNIEnv*, jclass, jint codePoint) {