[empire-db] branch master updated: EMPIREDB-282 fixed misleading error message

[doebele]

This is an automated email from the ASF dual-hosted git repository.

doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git


The following commit(s) were added to refs/heads/master by this push:
     new 9669bc3  EMPIREDB-282 fixed misleading error message
     new 7d2a78a  Merge branch 'master' of 
https://gitbox.apache.org/repos/asf/empire-db
9669bc3 is described below

commit 9669bc39e0d071d031d82ef9a1991a51259fbbd6
Author: Rainer Döbele <doeb...@apache.org>
AuthorDate: Fri Jan 31 17:42:14 2020 +0100

    EMPIREDB-282
    fixed misleading error message
---
 .../main/java/org/apache/empire/jsf2/controls/InputControl.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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.context.ResponseWriter;
 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 @@ public abstract class InputControl
         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.");