Return-Path: 
 <cocoon-cvs-return-7200-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 20999 invoked by uid 500); 3 Jun 2002 10:36:03 -0000
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
list-help: <mailto:cocoon-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-cvs@xml.apache.org>
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 20986 invoked by uid 500); 3 Jun 2002 10:36:03 -0000
Delivered-To: apmail-xml-cocoon2-cvs@apache.org
Date: 3 Jun 2002 10:36:02 -0000
Message-ID: <20020603103602.79377.qmail@icarus.apache.org>
From: cziegeler@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit:
 xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/components
 HandlerManager.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

cziegeler    2002/06/03 03:36:02

  Modified:    src/java/org/apache/cocoon/webapps/authentication/components
                        HandlerManager.java
  Log:
  Fixed bug in handlers
  
  Revision  Changes    Path
  1.6       +10 -7     xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/components/HandlerManager.java
  
  Index: HandlerManager.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/components/HandlerManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- HandlerManager.java	3 Jun 2002 10:02:01 -0000	1.5
  +++ HandlerManager.java	3 Jun 2002 10:36:01 -0000	1.6
  @@ -64,7 +64,7 @@
    *  This is a utility class managing the authentication handlers
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: HandlerManager.java,v 1.5 2002/06/03 10:02:01 cziegeler Exp $
  + * @version CVS $Id: HandlerManager.java,v 1.6 2002/06/03 10:36:01 cziegeler Exp $
   */
   public final class HandlerManager {
   
  @@ -103,8 +103,16 @@
                       if ( null != handlersWrapper ) {
                           Configuration[] handlers = handlersWrapper.getChildren("handler");
                           if ( null != handlers ) {
  -                            for(int i=0; i<handlers.length;i++)
  +                            ArrayList al = new ArrayList(4);
  +                            for(int i=0; i<handlers.length;i++) {
  +                                // check unique name
  +                                final String name = handlers[i].getAttribute("name");
  +                                if ( al.contains(name) ) {
  +                                    throw new ConfigurationException("Handler names must be unique: " + name);
  +                                }
  +                                al.add( name );
                                   this.addHandler( handlers[i], resolver, request);
  +                            }
                           }
                       }
                   }
  @@ -121,11 +129,6 @@
       throws ConfigurationException {
           // get handler name
           final String name = configuration.getAttribute("name");
  -
  -        // test if handler is unique
  -        if (configuredHandlers.get(name) != null) {
  -            throw new ConfigurationException("Handler names must be unique: " + name);
  -        }
   
           // create handler
           Handler currentHandler = new Handler(name);
  
  
  

----------------------------------------------------------------------
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