--- a/jvmci/jdk.vm.ci.hotspot.jfr/src/jdk/vm/ci/hotspot/jfr/events/JFREventProvider.java	Thu Apr 28 14:55:09 2016 +0200
+++ b/jvmci/jdk.vm.ci.hotspot.jfr/src/jdk/vm/ci/hotspot/jfr/events/JFREventProvider.java	Thu Apr 28 15:16:47 2016 +0200
@@ -26,9 +26,7 @@
 
 import java.net.URISyntaxException;
 
-import jdk.vm.ci.hotspot.events.EmptyEventProvider.EmptyCompilationEvent;
-import jdk.vm.ci.hotspot.events.EmptyEventProvider.EmptyCompilerFailureEvent;
-import jdk.vm.ci.hotspot.events.EventProvider;
+import jdk.vm.ci.hotspot.services.EventProvider;
 
 /**
  * A JFR implementation for {@link EventProvider}. This implementation is used when Flight Recorder
@@ -38,7 +36,7 @@
  * <a href="https://bugs.openjdk.java.net/browse/JDK-8032211">JDK-8032211</a>.
  */
 @SuppressWarnings("deprecation")
-public final class JFREventProvider implements EventProvider {
+public final class JFREventProvider extends EventProvider {
 
     private final boolean enabled;
 
@@ -89,11 +87,12 @@
         }
     }
 
+    @Override
     public CompilationEvent newCompilationEvent() {
         if (enabled) {
             return new JFRCompilationEvent();
         }
-        return new EmptyCompilationEvent();
+        return EventProvider.createEmptyCompilationEvent();
     }
 
     /**
@@ -145,11 +144,12 @@
         }
     }
 
+    @Override
     public CompilerFailureEvent newCompilerFailureEvent() {
         if (enabled) {
             return new JFRCompilerFailureEvent();
         }
-        return new EmptyCompilerFailureEvent();
+        return EventProvider.createEmptyCompilerFailureEvent();
     }
 
     /**