Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 26850 invoked from network); 2 Jan 2005 22:26:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 2 Jan 2005 22:26:36 -0000 Received: (qmail 54907 invoked by uid 500); 2 Jan 2005 22:26:36 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 54840 invoked by uid 500); 2 Jan 2005 22:26:35 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 54825 invoked by uid 99); 2 Jan 2005 22:26:35 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sun, 02 Jan 2005 14:26:35 -0800 Received: (qmail 26825 invoked by uid 65534); 2 Jan 2005 22:26:34 -0000 Date: 2 Jan 2005 22:26:34 -0000 Message-ID: <20050102222634.26823.qmail@minotaur.apache.org> From: antonio@apache.org To: cvs@cocoon.apache.org Subject: svn commit: r123906 - /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: antonio Date: Sun Jan 2 14:26:33 2005 New Revision: 123906 URL: http://svn.apache.org/viewcvs?view=rev&rev=123906 Log: Input select never is null at this point. Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java?view=diff&rev=123906&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java&r1=123905&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java&r2=123906 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java Sun Jan 2 14:26:33 2005 @@ -140,14 +140,13 @@ ComponentSelector inputSelector = this.inputSelector; InputModule module = null; try { - if (inputSelector == null) - inputSelector=(ComponentSelector) this.manager.lookup(INPUT_MODULE_SELECTOR); - - if (inputSelector.hasComponent(type)){ - - if (type != null && inputSelector.hasComponent(type)) + if (inputSelector == null) { + inputSelector=(ComponentSelector) this.manager.lookup(INPUT_MODULE_SELECTOR); + } + if (inputSelector.hasComponent(type)) { + if (type != null && inputSelector.hasComponent(type)) { module = (InputModule) inputSelector.select(type); - + } if (!(module instanceof ThreadSafe) ) { inputSelector.release(module); module = null; @@ -156,9 +155,8 @@ if (type != null && module == null) if (getLogger().isWarnEnabled()) getLogger().warn("A problem occurred setting up '" + type - +"': Selector is "+(inputSelector!=null?"not ":"") - +"null, Component is " - +(inputSelector!=null && inputSelector.hasComponent(type)?"known":"unknown")); + + "': Selector is not null, Component is " + + (inputSelector.hasComponent(type)? "known" : "unknown")); } catch (ComponentException ce) { if (getLogger().isWarnEnabled())