changeset 7831:ff0a291b82f1

Merge
author dsamersoff
date Thu, 15 Jan 2015 12:02:55 +0000
parents 10b06bffc9c1 15502499ac47
children 1fe6cafa652e
files
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/prims/perf.cpp	Wed Jan 07 08:37:49 2015 +0100
+++ b/src/share/vm/prims/perf.cpp	Thu Jan 15 12:02:55 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;