# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1474511822 25200
# Node ID 37a27e8594285702043a9fe42e49bbfd99e9bf46
# Parent  d0008e893639b27dfc80a6df6b747c01871eae51
Bring over missing null check from JDK9

diff -r d0008e893639 -r 37a27e859428 jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java	Mon Sep 19 15:47:00 2016 +0200
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java	Wed Sep 21 19:37:02 2016 -0700
@@ -76,7 +76,7 @@
             HotSpotVMConfigStore store = runtime.getConfigStore();
             for (Map.Entry<String, VMField> e : store.getFields().entrySet()) {
                 VMField field = e.getValue();
-                if (field.isStatic() && field.value == address) {
+                if (field.isStatic() && field.value != null && field.value == address) {
                     return e.getValue() + ":0x" + Long.toHexString(address);
                 }
             }