Merge pull request #144 from eclipse-ee4j/4.0.0
Merge 4.0.0 into master
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);
}
}
diff --git a/spec/pom.xml b/spec/pom.xml
index 38331d4..7772f80 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -172,7 +172,7 @@
</goals>
<configuration>
<backend>html5</backend>
- <outputFile>${project.build.directory}/generated-docs/expression-language-spec-${project.version}.html</outputFile>
+ <outputFile>${project.build.directory}/generated-docs/jakarta-expression-language-spec-${project.version}.html</outputFile>
<attributes>
<doctype>book</doctype>
<status>${status}</status>
@@ -195,7 +195,7 @@
</goals>
<configuration>
<backend>pdf</backend>
- <outputFile>${project.build.directory}/generated-docs/expression-language-spec-${project.version}.pdf</outputFile>
+ <outputFile>${project.build.directory}/generated-docs/jakarta-expression-language-spec-${project.version}.pdf</outputFile>
<attributes>
<pdf-stylesdir>${project.basedir}/src/main/theme</pdf-stylesdir>
<pdf-style>jakartaee</pdf-style>
