changeset 23325:f895a46e0a45

8150850: [JVMCI] NPE when executing HotSpotConstantReflectionProvider.readStableFieldValue Contributed-by: kshefov Reviewed-by: twisti, dnsimon
author Roland Schatz <roland.schatz@oracle.com>
date Tue, 15 Mar 2016 13:00:43 +0300
parents c4ac68fc4b12
children b364269cb6cf
files jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java	Wed Mar 16 19:57:25 2016 -0700
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java	Tue Mar 15 13:00:43 2016 +0300
@@ -338,7 +338,7 @@
 
     public JavaConstant readStableFieldValue(ResolvedJavaField field, JavaConstant receiver, boolean isDefaultStable) {
         JavaConstant fieldValue = readNonStableFieldValue(field, receiver);
-        if (fieldValue.isNonNull()) {
+        if (fieldValue != null && fieldValue.isNonNull()) {
             JavaType declaredType = field.getType();
             if (declaredType.getComponentType() != null) {
                 int stableDimension = getArrayDimension(declaredType);