[empire-db] branch master updated: EMPIREDB-282 small fix

[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 841ea68  EMPIREDB-282 small fix
841ea68 is described below

commit 841ea68fdd70d062bb9694d88b9242cb8d2e2d16
Author: Rainer Döbele <doeb...@apache.org>
AuthorDate: Fri Nov 22 13:04:38 2019 +0100

    EMPIREDB-282
    small fix
---
 .../apache/empire/jsf2/controls/SelectInputControl.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
index 1e1ee54..0d2c649 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
@@ -18,7 +18,6 @@
  */
 package org.apache.empire.jsf2.controls;
 
-import java.lang.reflect.Field;
 import java.util.Iterator;
 import java.util.List;
 
@@ -32,9 +31,7 @@ import org.apache.empire.commons.ObjectUtils;
 import org.apache.empire.commons.OptionEntry;
 import org.apache.empire.commons.Options;
 import org.apache.empire.data.Column;
-import org.apache.empire.exceptions.InternalException;
 import org.apache.empire.exceptions.InvalidArgumentException;
-import org.apache.empire.exceptions.ItemNotFoundException;
 import org.apache.empire.exceptions.UnexpectedReturnValueException;
 import org.apache.empire.jsf2.app.TextResolver;
 import org.slf4j.Logger;
@@ -129,13 +126,18 @@ public class SelectInputControl extends InputControl
             return false;
         }
         // check required
-        if (!ii.isRequired())
-        {   // check column
+        if (ii.isRequired()==false)
+        {   // not required!   
+            /* 
+             * Old code: Why check this?
+             * 
             Column column = ii.getColumn(); 
-            if (column==null || !column.isRequired())
+            if (column==null || !(ii.isDisabled() && !column.isRequired()))
             {   // add empty entry
                 return true;
             }
+            */
+            return true;
         }
         // Check Value
         return ObjectUtils.isEmpty(currentValue);