Merge

Fri, 27 Mar 2020 19:15:09 +0000

author
andrew
date
Fri, 27 Mar 2020 19:15:09 +0000
changeset 9900
dd05dac9563a
parent 9899
bc53a86f5357
parent 9851
095e60e7fc8c
child 9901
b5843f684541

Merge

.hgtags file | annotate | diff | comparison | revisions
src/share/vm/runtime/thread.cpp file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Mar 24 21:50:37 2020 +0000
     1.2 +++ b/.hgtags	Fri Mar 27 19:15:09 2020 +0000
     1.3 @@ -1303,3 +1303,4 @@
     1.4  9003f35baaa0d57d225bf72cf82fb0a8ee049c98 jdk8u262-b00
     1.5  b4fd7e078c54a23ed44f09aec3f6938bed3e3630 jdk8u252-b06
     1.6  d17814ea88e3aa0a2f2fdb125e35a878ee27fe3e jdk8u252-b07
     1.7 +8f2780b3e4faf4792ac885f470bb1602d4ca5526 jdk8u252-b08
     2.1 --- a/src/share/vm/runtime/thread.cpp	Tue Mar 24 21:50:37 2020 +0000
     2.2 +++ b/src/share/vm/runtime/thread.cpp	Fri Mar 27 19:15:09 2020 +0000
     2.3 @@ -836,7 +836,9 @@
     2.4  }
     2.5  
     2.6  void Thread::oops_do(OopClosure* f, CLDClosure* cld_f, CodeBlobClosure* cf) {
     2.7 -  active_handles()->oops_do(f);
     2.8 +  if (active_handles() != NULL) {
     2.9 +    active_handles()->oops_do(f);
    2.10 +  }
    2.11    // Do oop for ThreadShadow
    2.12    f->do_oop((oop*)&_pending_exception);
    2.13    handle_area()->oops_do(f);

mercurial