diff graal/com.oracle.jvmci.hotspot/src/com/oracle/jvmci/hotspot/HotSpotJVMCIRuntime.java @ 21687:afea1d08c393

Merge with df4579cb9503128c646bd04e66646ccfa7faf25f
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Tue, 02 Jun 2015 18:32:11 -0700
parents 2e8c01def9a5
children 3d15183f3c93
line wrap: on
line diff
--- a/graal/com.oracle.jvmci.hotspot/src/com/oracle/jvmci/hotspot/HotSpotJVMCIRuntime.java	Tue Jun 02 17:41:19 2015 -0700
+++ b/graal/com.oracle.jvmci.hotspot/src/com/oracle/jvmci/hotspot/HotSpotJVMCIRuntime.java	Tue Jun 02 18:32:11 2015 -0700
@@ -220,7 +220,12 @@
             hostBackend = registerBackend(factory.createJVMCIBackend(this, null));
         }
 
-        vmEventListener = Services.loadSingle(HotSpotVMEventListener.class, true);
+        HotSpotVMEventListener listener = Services.loadSingle(HotSpotVMEventListener.class, false);
+        if (listener == null) {
+            listener = new HotSpotVMEventListener() {
+            };
+        }
+        vmEventListener = listener;
     }
 
     private JVMCIBackend registerBackend(JVMCIBackend backend) {