commit d280b6911f2f80ccccde3f6f95a660b14f9dfe58
author Ed Bratt <ed.bratt@oracle.com> Wed Sep 23 07:14:46 2020 -0700
committer GitHub <noreply@github.com> Wed Sep 23 07:14:46 2020 -0700
tree 74429ce84497718363dafc7611f2ccf221c7274f
parent 288f7cd30d26c8541d71e62ffa9fef222c1f9990
parent 7ba85fbc0dc06dec3389618c74a595ded8cc0687

Merge pull request #140 from jbescos/astValueNullPointer

NullPointerException when value and targetType is null

impl/src/main/java/com/sun/el/parser/AstValue.java

diff --git a/impl/src/main/java/com/sun/el/parser/AstValue.java b/impl/src/main/java/com/sun/el/parser/AstValue.java
index 2b99930..1b9bd48 100644
--- a/impl/src/main/java/com/sun/el/parser/AstValue.java
+++ b/impl/src/main/java/com/sun/el/parser/AstValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -217,7 +217,7 @@
             if (ctx.isPropertyResolved()) {
                 value = targetValue;
             } else {
-                if (value != null || targetType.isPrimitive()) {
+                if (value != null || (targetType != null && targetType.isPrimitive())) {
                     value = ELSupport.coerceToType(value, targetType);
                 }
             }