diff src/os/solaris/vm/thread_solaris.inline.hpp @ 21645:7eb156f30b61

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 01 Jun 2015 22:13:10 +0200
parents ca3c6538bcec
children
line wrap: on
line diff
--- a/src/os/solaris/vm/thread_solaris.inline.hpp	Mon Jun 01 22:12:57 2015 +0200
+++ b/src/os/solaris/vm/thread_solaris.inline.hpp	Mon Jun 01 22:13:10 2015 +0200
@@ -47,7 +47,7 @@
   uintptr_t raw = pd_raw_thread_id();
   int ix = pd_cache_index(raw);
   Thread* candidate = ThreadLocalStorage::_get_thread_cache[ix];
-  if (candidate->self_raw_id() == raw) {
+  if (candidate != NULL && candidate->self_raw_id() == raw) {
     // hit
     return candidate;
   } else {