Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
Date: 16 Dec 2002 14:55:05 -0000
Message-ID: <20021216145505.91228.qmail@icarus.apache.org>
From: haul@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit:
 xml-cocoon2/src/java/org/apache/cocoon/components/modules/input
 AbstractMetaModule.java ChainMetaModule.java

haul        2002/12/16 06:55:05

  Modified:    src/java/org/apache/cocoon/components/modules/input
                        AbstractMetaModule.java ChainMetaModule.java
  Log:
  Fix wrong brackets thanks to Jeff Turner
  
  Revision  Changes    Path
  1.6       +6 -4      xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java
  
  Index: AbstractMetaModule.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractMetaModule.java	16 Dec 2002 09:43:18 -0000	1.5
  +++ AbstractMetaModule.java	16 Dec 2002 14:55:05 -0000	1.6
  @@ -152,15 +152,17 @@
        */
       public void dispose() {
   
  -        if (!this.initialized.booleanValue()) 
  -            if (getLogger().isErrorEnabled()) 
  +        if (!this.initialized.booleanValue()) {
  +            if (getLogger().isErrorEnabled()) {
                   getLogger().error("Uninitialized Component! FAILING");
  -        else 
  +            }
  +        } else {
               if (this.inputSelector != null) {
                   if (this.input != null)
                       this.inputSelector.release(this.input);
                   this.manager.release(this.inputSelector);
               }
  +        }
       }
   
   
  
  
  
  1.5       +14 -12    xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/ChainMetaModule.java
  
  Index: ChainMetaModule.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/ChainMetaModule.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ChainMetaModule.java	16 Dec 2002 09:50:54 -0000	1.4
  +++ ChainMetaModule.java	16 Dec 2002 14:55:05 -0000	1.5
  @@ -165,19 +165,21 @@
       
       public void dispose() {
           
  -        if (!this.initialized.booleanValue()) 
  -            if (getLogger().isErrorEnabled()) 
  +        if (!this.initialized.booleanValue()) {
  +            if (getLogger().isErrorEnabled()) {
                   getLogger().error("Uninitialized Component! dispose() FAILING");
  -            else 
  -                if (this.inputSelector != null) {
  -                    
  -                    for (int i=0; i<this.inputs.length; i++) {
  -                        if (this.inputs[i].input != null)
  -                            this.inputSelector.release(this.inputs[i].input);
  -                    }
  -
  -                    this.manager.release(this.inputSelector);
  +            }
  +        } else {
  +            if (this.inputSelector != null) {
  +                
  +                for (int i=0; i<this.inputs.length; i++) {
  +                    if (this.inputs[i].input != null)
  +                        this.inputSelector.release(this.inputs[i].input);
                   }
  +                
  +                this.manager.release(this.inputSelector);
  +            }
  +        }
       }
   
   
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org