diff options
| author | 2016-10-19 16:18:50 +0000 | |
|---|---|---|
| committer | 2016-10-19 16:18:51 +0000 | |
| commit | c89f9776a107ca20d0146c16fa881db91c4f8266 (patch) | |
| tree | f77bd4525e69c4874c52183878ae642fd5a2201c /runtime/native/java_lang_Class.cc | |
| parent | 58b99c78d0bba093fddebab0dcad45bbcf5c55d9 (diff) | |
| parent | 709b070044354d9f47641f273edacaeeb0240ab7 (diff) | |
Merge "Remove mirror:: and ArtMethod deps in utils.{h,cc}"
Diffstat (limited to 'runtime/native/java_lang_Class.cc')
| -rw-r--r-- | runtime/native/java_lang_Class.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc index ac5dbdabf7..642826c621 100644 --- a/runtime/native/java_lang_Class.cc +++ b/runtime/native/java_lang_Class.cc @@ -633,7 +633,8 @@ static jobject Class_newInstance(JNIEnv* env, jobject javaThis) { if (UNLIKELY(klass->GetPrimitiveType() != 0 || klass->IsInterface() || klass->IsArrayClass() || klass->IsAbstract())) { soa.Self()->ThrowNewExceptionF("Ljava/lang/InstantiationException;", - "%s cannot be instantiated", PrettyClass(klass.Get()).c_str()); + "%s cannot be instantiated", + klass->PrettyClass().c_str()); return nullptr; } auto caller = hs.NewHandle<mirror::Class>(nullptr); @@ -643,7 +644,7 @@ static jobject Class_newInstance(JNIEnv* env, jobject javaThis) { if (caller.Get() != nullptr && !caller->CanAccess(klass.Get())) { soa.Self()->ThrowNewExceptionF( "Ljava/lang/IllegalAccessException;", "%s is not accessible from %s", - PrettyClass(klass.Get()).c_str(), PrettyClass(caller.Get()).c_str()); + klass->PrettyClass().c_str(), caller->PrettyClass().c_str()); return nullptr; } } @@ -654,7 +655,7 @@ static jobject Class_newInstance(JNIEnv* env, jobject javaThis) { if (UNLIKELY(constructor == nullptr)) { soa.Self()->ThrowNewExceptionF("Ljava/lang/InstantiationException;", "%s has no zero argument constructor", - PrettyClass(klass.Get()).c_str()); + klass->PrettyClass().c_str()); return nullptr; } // Invoke the string allocator to return an empty string for the string class. @@ -684,7 +685,7 @@ static jobject Class_newInstance(JNIEnv* env, jobject javaThis) { caller.Get()))) { soa.Self()->ThrowNewExceptionF( "Ljava/lang/IllegalAccessException;", "%s is not accessible from %s", - PrettyMethod(constructor).c_str(), PrettyClass(caller.Get()).c_str()); + constructor->PrettyMethod().c_str(), caller->PrettyClass().c_str()); return nullptr; } } |