avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container DefaultContainer.java
Date Sat, 21 Dec 2002 09:27:01 GMT
mcconnell    2002/12/21 01:27:01

  Modified:    merlin/src/java/org/apache/avalon/merlin/container
                        DefaultContainer.java
  Log:
  Context related cleanup.
  
  Revision  Changes    Path
  1.8       +4 -4      avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/DefaultContainer.java
  
  Index: DefaultContainer.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/DefaultContainer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultContainer.java	21 Dec 2002 05:18:22 -0000	1.7
  +++ DefaultContainer.java	21 Dec 2002 09:27:01 -0000	1.8
  @@ -207,12 +207,13 @@
               if( getLogger().isDebugEnabled() )
               {
                   final String message =
  -                  "activating container: [" + appliance.getName() + "]"; 
  +                  "activating container: " + appliance; 
                   getLogger().debug( message );
               }
   
               try
               {
  +                appliance.assemble();
                   Container container = (Container) appliance.access();
                   m_containerMap.put( appliance, container );
               }
  @@ -220,7 +221,7 @@
               {
                   final String error =
                     "Could not establish a sub-container: " 
  -                     + appliance.getName() 
  +                     + appliance
                        + " in container: " + this;
                   throw new ContainerException( error, e );
               }
  @@ -463,8 +464,7 @@
       }
   
      /**
  -    * Shutdown all subsidiary containers and all components in this container.
  -    * @exception Exception if a shutdown error occurs
  +    * Release all of the components in this container.
       */
       protected void disposeComponents()
       {
  
  
  

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


Mime
View raw message