You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2018/04/04 14:24:15 UTC
[myfaces-tobago] 03/03: Resolves same issue as MYFACES-4199 * NPE
inside empty
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 4f7ea483cbbb4c1df8a56e9e40cd2d9da852c389
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Apr 4 16:21:38 2018 +0200
Resolves same issue as MYFACES-4199
* NPE inside empty <f:selectItem>
---
.../tobago/internal/renderkit/renderer/SelectManyRendererBase.java | 4 +++-
.../java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
index ad424e1..7f99f49 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
@@ -675,7 +675,9 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
// must be called on the string rendered attribute values
Object itemLabel = attributeMap.get(ITEM_LABEL_ATTR);
if (itemLabel == null) {
- itemLabel = itemValue.toString();
+ if (itemValue != null) {
+ itemLabel = itemValue.toString();
+ }
} else {
itemLabel = itemLabel.toString();
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java
index 71ddbcc..74a1b5e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/SelectItemUtils.java
@@ -139,7 +139,7 @@ public class SelectItemUtils {
final boolean disabled = uiSelectItem.isItemDisabled();
// boolean escape = uiSelectItem.isItemEscaped();
// boolean noSelectionOption = uiSelectItem.isNoSelectionOption();
- if (label == null) {
+ if (label == null && itemValue != null) {
label = itemValue.toString();
}
String image = null;
--
To stop receiving notification emails like this one, please contact
lofwyr@apache.org.