Return-Path: X-Original-To: apmail-empire-db-commits-archive@www.apache.org Delivered-To: apmail-empire-db-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A9599108D3 for ; Fri, 21 Jun 2013 11:27:10 +0000 (UTC) Received: (qmail 78414 invoked by uid 500); 21 Jun 2013 11:27:10 -0000 Delivered-To: apmail-empire-db-commits-archive@empire-db.apache.org Received: (qmail 78395 invoked by uid 500); 21 Jun 2013 11:27:10 -0000 Mailing-List: contact commits-help@empire-db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: empire-db-dev@empire-db.apache.org Delivered-To: mailing list commits@empire-db.apache.org Received: (qmail 78386 invoked by uid 99); 21 Jun 2013 11:27:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Jun 2013 11:27:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Jun 2013 11:27:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4DEEA2388C6A for ; Fri, 21 Jun 2013 11:26:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1495390 - in /empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2: app/FacesApplication.java utils/TagEncodingHelper.java Date: Fri, 21 Jun 2013 11:26:49 -0000 To: commits@empire-db.apache.org From: doebele@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130621112649.4DEEA2388C6A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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;