1.1 --- a/src/share/vm/runtime/thread.cpp Mon Feb 01 13:19:14 2016 -0800
1.2 +++ b/src/share/vm/runtime/thread.cpp Tue Feb 02 11:44:20 2016 +0300
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -2926,13 +2926,13 @@
1.11 const char* name_str;
1.12 oop thread_obj = threadObj();
1.13 if (thread_obj != NULL) {
1.14 - typeArrayOop name = java_lang_Thread::name(thread_obj);
1.15 + oop name = java_lang_Thread::name(thread_obj);
1.16 if (name != NULL) {
1.17 if (buf == NULL) {
1.18 - name_str = UNICODE::as_utf8((jchar*) name->base(T_CHAR), name->length());
1.19 + name_str = java_lang_String::as_utf8_string(name);
1.20 }
1.21 else {
1.22 - name_str = UNICODE::as_utf8((jchar*) name->base(T_CHAR), name->length(), buf, buflen);
1.23 + name_str = java_lang_String::as_utf8_string(name, buf, buflen);
1.24 }
1.25 }
1.26 else if (is_attaching_via_jni()) { // workaround for 6412693 - see 6404306
