Merge
authorehelin
Thu, 15 Aug 2013 06:20:48 -0700
changeset 19291 0026ec3d09e3
parent 19289 213031f03f61 (current diff)
parent 19290 f24424504e61 (diff)
child 19292 4ea37162ea08
child 19340 f62b3c74b50f
Merge
--- a/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp	Thu Aug 15 10:05:50 2013 +0200
+++ b/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp	Thu Aug 15 06:20:48 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() {