changeset 28619:adeadd271a0f

Merge
author dsamersoff
date Wed, 14 Jan 2015 17:22:28 +0000
parents 62e06483ebfc f9d2242c1874
children 0e23eb51d29e
files
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/prims/perf.cpp	Wed Jan 14 15:25:13 2015 +0000
+++ b/hotspot/src/share/vm/prims/perf.cpp	Wed Jan 14 17:22:28 2015 +0000
@@ -100,6 +100,11 @@
 
   PerfWrapper("Perf_Detach");
 
+  if (!UsePerfData) {
+    // With -XX:-UsePerfData, detach is just a NOP
+    return;
+  }
+
   void* address = 0;
   jlong capacity = 0;