Mercurial > hg > truffle

comparison 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
comparison
equal deleted inserted replaced
6151:e778c29768e6 6152:958bb4b7be49
190 } else { 190 } else {
191 // Pop the stack, by skipping over the tag and its null. 191 // Pop the stack, by skipping over the tag and its null.
192 _element_close_stack_ptr = cur_tag + strlen(cur_tag) + 1; 192 _element_close_stack_ptr = cur_tag + strlen(cur_tag) + 1;
193 _element_depth -= 1; 193 _element_depth -= 1;
194 } 194 }
195 if (bad_tag && !VMThread::should_terminate() && !is_error_reported()) 195 if (bad_tag && !VMThread::should_terminate() && !VM_Exit::vm_exited() &&
196 !is_error_reported())
197 {
196 assert(false, "bad tag in log"); 198 assert(false, "bad tag in log");
199 }
197 } 200 }
198 #endif 201 #endif
199 202
200 203
201 // ------------------------------------------------------------------ 204 // ------------------------------------------------------------------