# HG changeset patch
# User kamg
# Date 1286895453 14400
# Node ID c77b5c592eabad07ef2b71e9e72cdb3a16f04436
# Parent  7491c8b96111ab5808bac270ae4508a785e2f36b
6392697: Additional flag needed to supress Hotspot warning messages
Summary: Apply PrintJvmWarnings flag to all warnings
Reviewed-by: coleenp, phh

diff -r 7491c8b96111 -r c77b5c592eab src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Thu Oct 07 15:14:41 2010 -0400
+++ b/src/share/vm/runtime/globals.hpp	Tue Oct 12 10:57:33 2010 -0400
@@ -815,6 +815,9 @@
   develop(bool, PrintJVMWarnings, false,                                    \
           "Prints warnings for unimplemented JVM functions")                \
                                                                             \
+  product(bool, PrintWarnings, true,                                        \
+          "Prints JVM warnings to output stream")                           \
+                                                                            \
   notproduct(uintx, WarnOnStalledSpinLock, 0,                               \
           "Prints warnings for stalled SpinLocks")                          \
                                                                             \
diff -r 7491c8b96111 -r c77b5c592eab src/share/vm/utilities/debug.cpp
--- a/src/share/vm/utilities/debug.cpp	Thu Oct 07 15:14:41 2010 -0400
+++ b/src/share/vm/utilities/debug.cpp	Tue Oct 12 10:57:33 2010 -0400
@@ -51,14 +51,16 @@
 
 
 void warning(const char* format, ...) {
-  // In case error happens before init or during shutdown
-  if (tty == NULL) ostream_init();
+  if (PrintWarnings) {
+    // In case error happens before init or during shutdown
+    if (tty == NULL) ostream_init();
 
-  tty->print("%s warning: ", VM_Version::vm_name());
-  va_list ap;
-  va_start(ap, format);
-  tty->vprint_cr(format, ap);
-  va_end(ap);
+    tty->print("%s warning: ", VM_Version::vm_name());
+    va_list ap;
+    va_start(ap, format);
+    tty->vprint_cr(format, ap);
+    va_end(ap);
+  }
   if (BreakAtWarning) BREAKPOINT;
 }