From 39ec54cd97b22f88bb839d6cfe9710221b14a5b1 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 20 Jan 2010 16:18:49 +0000 Subject: [PATCH] Fixes a bug in V8 version of jni_utility_private.cpp When CONVERT_NULL_TO_EMPTY_STRING is defined, an 'else' is missing an opening brace. This causes compiler errors. This bug has been present since the code was first committed. See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=7fa30a60f66c19c8e6fb91ef799bca4d8d6f57f2#patch9 Change-Id: I7e95217d166733e6cab1f2e74725e368df4c6f4b --- WebCore/bridge/jni/v8/jni_utility_private.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WebCore/bridge/jni/v8/jni_utility_private.cpp b/WebCore/bridge/jni/v8/jni_utility_private.cpp index 6c8f0186b..2f8904721 100644 --- a/WebCore/bridge/jni/v8/jni_utility_private.cpp +++ b/WebCore/bridge/jni/v8/jni_utility_private.cpp @@ -60,11 +60,11 @@ jvalue convertNPVariantToJValue(NPVariant value, JNIType jniType, const char* ja jchar buf[2]; jobject javaString = env->functions->NewString (env, buf, 0); result.l = javaString; - } - else + } else #else - if (type == NPVariantType_String) { + if (type == NPVariantType_String) #endif + { NPString src = NPVARIANT_TO_STRING(value); JNIEnv *env = getJNIEnv(); jobject javaString = env->NewStringUTF(src.UTF8Characters); -- 2.11.0