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 2013/06/21 13:26:49 UTC
svn commit: r1495390 - in
/empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2:
app/FacesApplication.java utils/TagEncodingHelper.java
Author: doebele
Date: Fri Jun 21 11:26:48 2013
New Revision: 1495390
URL: http://svn.apache.org/r1495390
Log:
EMPIREDB-186
correct log condition and findChildComponent
Modified:
empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/FacesApplication.java
empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
Modified: empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/FacesApplication.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/FacesApplication.java?rev=1495390&r1=1495389&r2=1495390&view=diff
==============================================================================
--- empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/FacesApplication.java (original)
+++ empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/FacesApplication.java Fri Jun 21 11:26:48 2013
@@ -291,7 +291,7 @@ public abstract class FacesApplication e
}
if (component == null)
{
- findChildComponent(nextChild, componentId);
+ component = findChildComponent(nextChild, componentId);
}
if (component != null)
{
Modified: empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java?rev=1495390&r1=1495389&r2=1495390&view=diff
==============================================================================
--- empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java (original)
+++ empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java Fri Jun 21 11:26:48 2013
@@ -864,7 +864,7 @@ public class TagEncodingHelper implement
}
else
{ // not supplied
- if (!(tag instanceof ControlTag) && !((ControlTag)tag).isCustomInput())
+ if ((tag instanceof ControlTag) && !((ControlTag)tag).isCustomInput())
log.warn("No record supplied for {} and column {}.", tag.getClass().getSimpleName(), getColumnName());
}
return rec;