commit 9669bc39e0d071d031d82ef9a1991a51259fbbd6
author Rainer Döbele <doebele@apache.org> Fri Jan 31 17:42:14 2020 +0100
committer Rainer Döbele <doebele@apache.org> Fri Jan 31 17:42:14 2020 +0100
tree a07e2787cda60e4d4f96398abc21c7fee5c3113b
parent 5d08f8b4f6d0a96a041b6e2ed1c0ee8f06dd2633

EMPIREDB-282
fixed misleading error message

empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/InputControl.java

diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/InputControl.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/InputControl.java
index 03b7815..ebb3eff 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/InputControl.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/InputControl.java
@@ -34,6 +34,7 @@
 import javax.faces.event.PhaseId;

 

 import org.apache.empire.commons.ObjectUtils;

+import org.apache.empire.commons.OptionEntry;

 import org.apache.empire.commons.Options;

 import org.apache.empire.commons.StringUtils;

 import org.apache.empire.data.Column;

@@ -700,9 +701,9 @@
         Options options = vi.getOptions();

         if (options != null && !options.isEmpty() && !hasFormatOption(vi, "nolookup"))

         {   // Check for Options

-            String text = options.get(value);

-            if (StringUtils.isNotEmpty(text))

-                return vi.getText(text);

+            OptionEntry entry = options.getEntry(value);

+            if (entry!=null)

+                return vi.getText(entry.getText());

             // Error

             if (value!=null)

                 InputControl.log.error("The element '" + String.valueOf(value) + "' is not part of the supplied option list.");