# HG changeset patch
# User dholmes
# Date 1327537595 18000
# Node ID d851f37146418f6a2589e34385e9d9af32f81cba
# Parent  1ac084126285c7b8ebbd56dc17cc9f4056811bf8# Parent  5f3fcd591768d35e6489b28490cea5c3b0ab9802
Merge

diff -r 5f3fcd591768 -r d851f3714641 src/share/vm/utilities/xmlstream.cpp
--- 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