--- old/src/share/vm/prims/jvmtiUtil.hpp	2015-11-02 01:35:36.439386986 -0500
+++ new/src/share/vm/prims/jvmtiUtil.hpp	2015-11-02 01:35:35.175315946 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -79,7 +79,7 @@
     if (Threads::number_of_threads() == 0) {
       return JvmtiUtil::single_threaded_resource_area();
     }
-    thread = ThreadLocalStorage::thread();
+    thread = Thread::current();
     if (thread == NULL) {
       return JvmtiUtil::single_threaded_resource_area();
     }