NullPointerException when value and targetType is null

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
jakartaee · Sep 23, 2020 · 7ba85fb · 7ba85fb
1 parent 288f7cd
commit 7ba85fb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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 @@ public void setValue(EvaluationContext ctx, Object value) throws ELException {
             if (ctx.isPropertyResolved()) {
                 value = targetValue;
             } else {
-                if (value != null || targetType.isPrimitive()) {
+                if (value != null || (targetType != null && targetType.isPrimitive())) {
                     value = ELSupport.coerceToType(value, targetType);
                 }
             }