Mercurial > hg > truffle
diff src/share/vm/runtime/synchronizer.cpp @ 8883:b9a918201d47
Merge with hsx25
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Sat, 06 Apr 2013 20:04:06 +0200 |
parents | 5fc51c1ecdeb 5ee250974db9 |
children | 89e4d67fdd2a |
line wrap: on
line diff
--- a/src/share/vm/runtime/synchronizer.cpp Fri Apr 05 18:53:57 2013 +0200 +++ b/src/share/vm/runtime/synchronizer.cpp Sat Apr 06 20:04:06 2013 +0200 @@ -813,6 +813,7 @@ } if (owner != NULL) { + // owning_thread_from_monitor_owner() may also return NULL here return Threads::owning_thread_from_monitor_owner(owner, doLock); }