(empire-db) branch master updated: EMPIREDB-430 InputTag.validate(): ignore in case of conversion error

[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 b628a6e9 EMPIREDB-430 InputTag.validate(): ignore in case of 
conversion error
b628a6e9 is described below

commit b628a6e9ae6818feb91b66ef345f68d79176b69e
Author: Rainer Döbele <doeb...@apache.org>
AuthorDate: Wed Nov 13 11:26:22 2024 +0100

    EMPIREDB-430
    InputTag.validate(): ignore in case of conversion error
---
 .../src/main/java/org/apache/empire/jakarta/components/ControlTag.java  | 2 +-
 .../src/main/java/org/apache/empire/jakarta/components/InputTag.java    | 2 +-
 .../src/main/java/org/apache/empire/jsf2/components/ControlTag.java     | 2 +-
 .../src/main/java/org/apache/empire/jsf2/components/InputTag.java       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/ControlTag.java
 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/ControlTag.java
index b6ba78bd..b89d8357 100644
--- 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/ControlTag.java
+++ 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/ControlTag.java
@@ -744,7 +744,7 @@ public class ControlTag extends UIInput implements 
NamingContainer
         this.valueValidated = false;
         super.validate(context);
         // post check
-        if (!this.valueValidated && !helper.isReadOnly() && 
!helper.isDisabled())
+        if (isValid() && !this.valueValidated && !helper.isReadOnly() && 
!helper.isDisabled())
         {   // New since 2024-04-04
             // Validate Record value
             Object value = helper.getDataValue(true);
diff --git 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/InputTag.java
 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/InputTag.java
index 63072ae5..346fdcfe 100644
--- 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/InputTag.java
+++ 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/InputTag.java
@@ -348,7 +348,7 @@ public class InputTag extends UIInput implements 
NamingContainer
         this.valueValidated = false;
         super.validate(context);
         // post check
-        if (!this.valueValidated && !helper.isReadOnly() && 
!helper.isDisabled())
+        if (isValid() && !this.valueValidated && !helper.isReadOnly() && 
!helper.isDisabled())
         {   // New since 2024-04-04
             // Validate Record value
             Object value = helper.getDataValue(true);
diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java
 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java
index 5b48b4af..eb35512a 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java
@@ -744,7 +744,7 @@ public class ControlTag extends UIInput implements 
NamingContainer
         this.valueValidated = false;
         super.validate(context);
         // post check
-        if (!this.valueValidated && !helper.isReadOnly() && 
!helper.isDisabled())
+        if (isValid() && !this.valueValidated && !helper.isReadOnly() && 
!helper.isDisabled())
         {   // New since 2024-04-04
             // Validate Record value
             Object value = helper.getDataValue(true);
diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java
index 2f584932..9816de84 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java
@@ -348,7 +348,7 @@ public class InputTag extends UIInput implements 
NamingContainer
         this.valueValidated = false;
         super.validate(context);
         // post check
-        if (!this.valueValidated && !helper.isReadOnly() && 
!helper.isDisabled())
+        if (isValid() && !this.valueValidated && !helper.isReadOnly() && 
!helper.isDisabled())
         {   // New since 2024-04-04
             // Validate Record value
             Object value = helper.getDataValue(true);