Merge pull request #4069 from BlainHamon/timob-12651

TIMOB-12651 Undo GetStringCritical: V8 string creation may trigger garba...
tidev · Apr 4, 2013 · af4b0cd · af4b0cd
2 parents b56bd05 + 2e031f2
commit af4b0cd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/android/runtime/v8/src/native/TypeConverter.cpp b/android/runtime/v8/src/native/TypeConverter.cpp
@@ -131,9 +131,9 @@ v8::Handle<v8::Value> TypeConverter::javaStringToJsString(JNIEnv *env, jstring j
 	}
 
 	int nativeStringLength = env->GetStringLength(javaString);
-	const jchar *nativeString = env->GetStringCritical(javaString, NULL);
+	const jchar *nativeString = env->GetStringChars(javaString, NULL);
 	v8::Handle<v8::String> jsString = v8::String::New(nativeString, nativeStringLength);
-	env->ReleaseStringCritical(javaString, nativeString);
+	env->ReleaseStringChars(javaString, nativeString);
 
 	return jsString;
 }
@@ -698,9 +698,9 @@ v8::Handle<v8::Object> TypeConverter::javaHashMapToJsValue(JNIEnv *env, jobject
 		if (isStringHashMap) {
 			jstring javaString = (jstring)javaPairKey;
 			int nativeStringLength = env->GetStringLength(javaString);
-			const jchar *nativeString = env->GetStringCritical(javaString, NULL);
+			const jchar *nativeString = env->GetStringChars(javaString, NULL);
 			jsPairKey = v8::String::New(nativeString, nativeStringLength);
-			env->ReleaseStringCritical(javaString, nativeString);
+			env->ReleaseStringChars(javaString, nativeString);
 		} else {
 			jsPairKey = TypeConverter::javaObjectToJsValue(env, javaPairKey);
 		}