Mercurial > hg > truffle

diff src/share/vm/utilities/xmlstream.cpp @ 6152:958bb4b7be49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Tue, 10 Apr 2012 10:42:34 -0700
parents 1ac084126285
children d2a62e0f25eb
line wrap: on
line diff
--- a/src/share/vm/utilities/xmlstream.cpp	Wed Apr 04 20:44:38 2012 -0700
+++ b/src/share/vm/utilities/xmlstream.cpp	Tue Apr 10 10:42:34 2012 -0700
@@ -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