Mercurial > hg > truffle

diff src/share/vm/utilities/vmError.cpp @ 6922:cae17c597196

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author coleenp
date Thu, 01 Nov 2012 11:57:53 -0400
parents a1b8cf9cf970
children bd7a7ce2e264
line wrap: on
line diff
--- a/src/share/vm/utilities/vmError.cpp	Fri Oct 26 14:18:57 2012 -0700
+++ b/src/share/vm/utilities/vmError.cpp	Thu Nov 01 11:57:53 2012 -0400
@@ -453,7 +453,9 @@
      JDK_Version::current().to_string(buf, sizeof(buf));
      const char* runtime_name = JDK_Version::runtime_name() != NULL ?
                                   JDK_Version::runtime_name() : "";
-     st->print_cr("# JRE version: %s (%s)", runtime_name, buf);
+     const char* runtime_version = JDK_Version::runtime_version() != NULL ?
+                                  JDK_Version::runtime_version() : "";
+     st->print_cr("# JRE version: %s (%s) (build %s)", runtime_name, buf, runtime_version);
      st->print_cr("# Java VM: %s (%s %s %s %s)",
                    Abstract_VM_Version::vm_name(),
                    Abstract_VM_Version::vm_release(),