Mercurial > hg > truffle

changeset 4900:f3fa16bd7159

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author bobv
date Wed, 25 Jan 2012 21:30:53 -0800
parents d851f3714641 (diff) a79cb7c55012 (current diff)
children b7b8b6d2f97d
files
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/utilities/xmlstream.cpp	Wed Jan 25 17:40:51 2012 -0500
+++ b/src/share/vm/utilities/xmlstream.cpp	Wed Jan 25 21:30:53 2012 -0800
@@ -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