You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by me...@apache.org on 2022/11/07 12:45:42 UTC
[myfaces] branch 3.0.x updated: MYFACES-4492: don't NPE when no label is set (#374)
This is an automated email from the ASF dual-hosted git repository.
melloware pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/3.0.x by this push:
new c4707be07 MYFACES-4492: don't NPE when no label is set (#374)
c4707be07 is described below
commit c4707be079cee2c61a11bad9619a44275c1c32c5
Author: Paul A. Nicolucci <pn...@gmail.com>
AuthorDate: Mon Nov 7 07:45:36 2022 -0500
MYFACES-4492: don't NPE when no label is set (#374)
---
api/src/main/java/jakarta/faces/model/SelectItem.java | 4 ----
.../myfaces/shared/renderkit/html/util/SelectItemsUtils.java | 9 ++++++++-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/api/src/main/java/jakarta/faces/model/SelectItem.java b/api/src/main/java/jakarta/faces/model/SelectItem.java
index 6ad2356ec..c76eed141 100644
--- a/api/src/main/java/jakarta/faces/model/SelectItem.java
+++ b/api/src/main/java/jakarta/faces/model/SelectItem.java
@@ -141,10 +141,6 @@ public class SelectItem implements Serializable
public void setLabel(String label)
{
- if (label == null)
- {
- throw new NullPointerException("label");
- }
_label = label;
}
diff --git a/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/SelectItemsUtils.java b/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/SelectItemsUtils.java
index e89116d0a..faf74bb66 100644
--- a/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/SelectItemsUtils.java
+++ b/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/SelectItemsUtils.java
@@ -204,7 +204,14 @@ public class SelectItemsUtils
//check if isEscape() = true first.
if (escape || selectItem.isEscape())
{
- writer.writeText(selectItem.getLabel(), null);
+ String label = selectItem.getLabel();
+
+ if(label == null)
+ {
+ label = "";
+ }
+
+ writer.writeText(label, null);
}
else
{