# HG changeset patch
# User egahlin
# Date 1389718936 -3600
# Node ID a5a219201e8c2adca14574f0be633b31c0b2f6da
# Parent  74474b3c3e21b15691fa5b92e7205e8a6a5da0bb
8031693: Two nsk/hprof/options/cpu failed with Stack Overflow in JFR on Linux-amd64 in Promotion testing of JDK8 b123
Reviewed-by: mgronlun

diff --git a/share/classes/oracle/jrockit/jfr/VMJFR.java b/share/classes/oracle/jrockit/jfr/VMJFR.java
--- a/share/classes/oracle/jrockit/jfr/VMJFR.java
+++ b/share/classes/oracle/jrockit/jfr/VMJFR.java
@@ -402,6 +402,8 @@
         byte[] instrumentedThrowable = ThrowableTracer.generateThrowableAsm();
         byte[] instrumentedError = ThrowableTracer.generateErrorAsm();
 
+        ThrowableTracer.enable(jfr, producer);
+
         if (!redefineClass0(java.lang.Throwable.class, instrumentedThrowable)) {
             throw new Exception("Could not instrument Throwable!");
         }
@@ -409,7 +411,6 @@
         if (!redefineClass0(java.lang.Error.class, instrumentedError)) {
             throw new Exception("Could not instrument Error!");
         }
-        ThrowableTracer.enable(jfr, producer);
     }
 
  }