Return-Path: 
 <cvs-return-16726-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 22711 invoked by uid 500); 3 Jun 2003 17:14:52 -0000
Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:cvs-unsubscribe@avalon.apache.org>
List-Subscribe: <mailto:cvs-subscribe@avalon.apache.org>
List-Help: <mailto:cvs-help@avalon.apache.org>
List-Post: <mailto:cvs@avalon.apache.org>
List-Id: "Avalon CVS List" <cvs.avalon.apache.org>
Reply-To: "Avalon Developers List" <dev@avalon.apache.org>
Delivered-To: mailing list cvs@avalon.apache.org
Received: (qmail 22700 invoked by uid 500); 3 Jun 2003 17:14:52 -0000
Received: (qmail 22697 invoked from network); 3 Jun 2003 17:14:51 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 3 Jun 2003 17:14:51 -0000
Received: (qmail 62522 invoked by uid 1438); 3 Jun 2003 17:14:51 -0000
Date: 3 Jun 2003 17:14:51 -0000
Message-ID: <20030603171451.62521.qmail@icarus.apache.org>
From: mcconnell@apache.org
To: avalon-sandbox-cvs@apache.org
Subject: cvs commit:
 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/impl
 AbstractLifestyleHandler.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

mcconnell    2003/06/03 10:14:51

  Modified:    merlin   project.xml
               merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/impl
                        AbstractLifestyleHandler.java
  Log:
  Applied patch from David Bernard re. lifecycle handling validation of potentially null handler.
  
  Revision  Changes    Path
  1.13      +1 -1      avalon-sandbox/merlin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/project.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- project.xml	14 May 2003 09:36:09 -0000	1.12
  +++ project.xml	3 Jun 2003 17:14:51 -0000	1.13
  @@ -134,7 +134,7 @@
         <name>David Bernard</name>
         <email>dwayne@java-fan.com</email>
         <roles>
  -        <role>Documentation and tutorial review, testing and patches.</role>
  +        <role>Documentation and tutorial review, testing and patches. Updates to lifecycle handlers.</role>
         </roles>
       </contributor>
       <contributor>
  
  
  
  1.3       +4 -3      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/impl/AbstractLifestyleHandler.java
  
  Index: AbstractLifestyleHandler.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/impl/AbstractLifestyleHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractLifestyleHandler.java	8 May 2003 03:02:39 -0000	1.2
  +++ AbstractLifestyleHandler.java	3 Jun 2003 17:14:51 -0000	1.3
  @@ -317,9 +317,10 @@
               throw new IllegalStateException( error );
           }
   
  -        if( Accessor.class.isAssignableFrom( getImplementationClass() ) )
  +        Object handler = provider.resolve( this );
  +        if ((handler != null)  && (handler instanceof Accessor))
           {
  -            Accessor extension = (Accessor) provider.resolve( this );
  +            Accessor extension = (Accessor) handler;
               try
               {
                   Context context = new DefaultContext( getAppliance().getContextMap() );
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org