src/share/vm/prims/jvmtiUtil.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 77,87 ****
      Thread* thread;
  
      if (Threads::number_of_threads() == 0) {
        return JvmtiUtil::single_threaded_resource_area();
      }
!     thread = ThreadLocalStorage::thread();
      if (thread == NULL) {
        return JvmtiUtil::single_threaded_resource_area();
      }
      return thread->resource_area();
    }
--- 77,87 ----
      Thread* thread;
  
      if (Threads::number_of_threads() == 0) {
        return JvmtiUtil::single_threaded_resource_area();
      }
!     thread = Thread::current_or_null();
      if (thread == NULL) {
        return JvmtiUtil::single_threaded_resource_area();
      }
      return thread->resource_area();
    }