# HG changeset patch
# User brutisso
# Date 1376596962 25200
# Node ID 8088d93a63e61ad0a226191e38e4c9a7afe2ba08
# Parent  33d39b75663ffcfd65ab5fab4a4b41cb3e284185# Parent  5888334c9c24f89ad0727796944f05198e0c2f67
Merge

diff -r 5888334c9c24 -r 8088d93a63e6 src/share/vm/gc_implementation/shared/objectCountEventSender.cpp
--- a/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp	Thu Aug 15 10:52:18 2013 +0200
+++ b/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp	Thu Aug 15 13:02:42 2013 -0700
@@ -32,6 +32,7 @@
 #if INCLUDE_SERVICES
 
 void ObjectCountEventSender::send(const KlassInfoEntry* entry, GCId gc_id, jlong timestamp) {
+#if INCLUDE_TRACE
   assert(Tracing::is_event_enabled(EventObjectCountAfterGC::eventId),
          "Only call this method if the event is enabled");
 
@@ -42,6 +43,7 @@
   event.set_totalSize(entry->words() * BytesPerWord);
   event.set_endtime(timestamp);
   event.commit();
+#endif // INCLUDE_TRACE
 }
 
 bool ObjectCountEventSender::should_send_event() {