From 15e9ad1d028d7f12cb598b075453173532a00d91 Mon Sep 17 00:00:00 2001 From: Jeff Hao Date: Tue, 19 May 2015 20:30:23 -0700 Subject: Intercept JNI invocation of String. methods. libmono uses JNI AllocObject and CallNonvirtualVoidMethod to create and initialize a string instead of using the recommended NewObject. This change adds an intercept to change the String. call to a StringFactory call instead. Then, it uses the object id of the original string object referrer and maps it to the result of the StringFactory. Bug: 21288130 Change-Id: Ib4db402c178bc37188d5c5faf30b6e4fdc747b17 --- runtime/jni_internal_test.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'runtime/jni_internal_test.cc') diff --git a/runtime/jni_internal_test.cc b/runtime/jni_internal_test.cc index 3d14a4e284..581ef0e61a 100644 --- a/runtime/jni_internal_test.cc +++ b/runtime/jni_internal_test.cc @@ -858,8 +858,7 @@ TEST_F(JniInternalTest, FromReflectedMethod_ToReflectedMethod) { jstring s = reinterpret_cast(env_->AllocObject(c)); ASSERT_NE(s, nullptr); env_->CallVoidMethod(s, mid2); - // With the string change, this should now throw an UnsupportedOperationException. - ASSERT_EQ(JNI_TRUE, env_->ExceptionCheck()); + ASSERT_EQ(JNI_FALSE, env_->ExceptionCheck()); env_->ExceptionClear(); mid = env_->GetMethodID(c, "length", "()I"); -- cgit v1.2.3