# HG changeset patch
# User Andreas Woess <andreas.woess@jku.at>
# Date 1416959630 -3600
# Node ID 3356ea5936725daac8f747cbcfa9f24201976fe2
# Parent  c2b23f6e46039764c9ba4e619ae3c527b0fbf335
Add missing null check in readConstantArrayElement

diff -r c2b23f6e4603 -r 3356ea593672 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java	Tue Nov 25 12:25:51 2014 -0800
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantReflectionProvider.java	Wed Nov 26 00:53:50 2014 +0100
@@ -90,7 +90,7 @@
     public JavaConstant readConstantArrayElement(JavaConstant array, int index) {
         if (array instanceof HotSpotObjectConstantImpl && ((HotSpotObjectConstantImpl) array).getStableDimension() > 0) {
             JavaConstant element = readArrayElement(array, index);
-            if (((HotSpotObjectConstantImpl) array).isDefaultStable() || !element.isDefaultForKind()) {
+            if (element != null && (((HotSpotObjectConstantImpl) array).isDefaultStable() || !element.isDefaultForKind())) {
                 return element;
             }
         }