# HG changeset patch
# User coleenp
# Date 1433903955 -7200
# Node ID 98b10897ee17e8ca03a2d92ec833f7c16049385c
# Parent  60081f497e7561c4a59b5f83eda7d9ff24733895# Parent  897c602148d915f22f5163b92dea8825b15eed1a
Merge

diff -r 60081f497e75 -r 98b10897ee17 hotspot/src/share/vm/utilities/exceptions.cpp
--- a/hotspot/src/share/vm/utilities/exceptions.cpp	Tue Jun 09 10:26:25 2015 -0400
+++ b/hotspot/src/share/vm/utilities/exceptions.cpp	Wed Jun 10 04:39:15 2015 +0200
@@ -164,9 +164,11 @@
   thread->set_pending_exception(h_exception(), file, line);
 
   // vm log
-  Events::log_exception(thread, "Exception <%s%s%s> (" INTPTR_FORMAT ") thrown at [%s, line %d]",
-                        h_exception->print_value_string(), message ? ": " : "", message ? message : "",
-                        (address)h_exception(), file, line);
+  if (LogEvents){
+    Events::log_exception(thread, "Exception <%s%s%s> (" INTPTR_FORMAT ") thrown at [%s, line %d]",
+                          h_exception->print_value_string(), message ? ": " : "", message ? message : "",
+                          (address)h_exception(), file, line);
+  }
 }