You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2024/08/07 10:59:52 UTC
(empire-db) branch master updated: EMPIREDB-433 Find rowset by Alias
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 67a97c92 EMPIREDB-433 Find rowset by Alias
67a97c92 is described below
commit 67a97c9221f5509a478b1a8d77725ad31ea4dc38
Author: Rainer Döbele <do...@apache.org>
AuthorDate: Wed Aug 7 12:59:48 2024 +0200
EMPIREDB-433
Find rowset by Alias
---
.../src/main/java/org/apache/empire/jakarta/app/DBELResolver.java | 2 ++
.../src/main/java/org/apache/empire/jsf2/app/DBELResolver.java | 2 ++
2 files changed, 4 insertions(+)
diff --git a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/app/DBELResolver.java b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/app/DBELResolver.java
index 148283c9..cbc36bd8 100644
--- a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/app/DBELResolver.java
+++ b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/app/DBELResolver.java
@@ -85,6 +85,8 @@ public class DBELResolver extends ELResolver
{ // Lookup RowSet
String name = StringUtils.toString(property);
DBRowSet rset = ((DBDatabase)base).getRowSet(name);
+ if (rset==null)
+ rset = ((DBDatabase)base).getRowSetByAlias(name); // 2nd chance
if (rset!=null)
context.setPropertyResolved(true);
else
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java
index 50c3d64d..1ec16b1c 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java
@@ -85,6 +85,8 @@ public class DBELResolver extends ELResolver
{ // Lookup RowSet
String name = StringUtils.toString(property);
DBRowSet rset = ((DBDatabase)base).getRowSet(name);
+ if (rset==null)
+ rset = ((DBDatabase)base).getRowSetByAlias(name); // 2nd chance
if (rset!=null)
context.setPropertyResolved(true);
else