Mercurial > hg > truffle
changeset 4898:d851f3714641
Merge
author | dholmes |
---|---|
date | Wed, 25 Jan 2012 19:26:35 -0500 |
parents | 1ac084126285 (diff) 5f3fcd591768 (current diff) |
children | f3fa16bd7159 |
files | src/os/bsd/vm/decoder_bsd.cpp |
diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/utilities/xmlstream.cpp Fri Jan 20 17:07:33 2012 -0800 +++ b/src/share/vm/utilities/xmlstream.cpp Wed Jan 25 19:26:35 2012 -0500 @@ -192,8 +192,11 @@ _element_close_stack_ptr = cur_tag + strlen(cur_tag) + 1; _element_depth -= 1; } - if (bad_tag && !VMThread::should_terminate() && !is_error_reported()) + if (bad_tag && !VMThread::should_terminate() && !VM_Exit::vm_exited() && + !is_error_reported()) + { assert(false, "bad tag in log"); + } } #endif