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/assembly/src/java/org/apache/avalon/assembly/appliance/impl DefaultAppliance.java
Date Thu, 19 Jun 2003 11:21:19 GMT
mcconnell    2003/06/19 04:21:19

  Modified:    merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl
                        DefaultAppliance.java
  Log:
  Added IllegalStateException if an attempt is made to access the deployment context prior
to the completion of the assembly phase.
  
  Revision  Changes    Path
  1.13      +4 -2      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultAppliance.java
  
  Index: DefaultAppliance.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultAppliance.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DefaultAppliance.java	18 Jun 2003 11:16:13 -0000	1.12
  +++ DefaultAppliance.java	19 Jun 2003 11:21:19 -0000	1.13
  @@ -123,7 +123,6 @@
    *    {@link Appliance} appliance = engine.createAppliance( context );
    *    {@link DependencyGraph} graph = new DependencyGraph();
    *    appliance.assemble( graph );
  - *    appliance.deploy();
    *    Object object = appliance.resolve( this );
    *
    *    //
  @@ -280,6 +279,7 @@
        */
       public void contextualize( Locator context ) throws ContextException
       {
  +       
           m_applianceContext = (ApplianceContext) context.get( ApplianceContext.KEY );
           m_lifestyle = (LifestyleService) context.get( LifestyleService.KEY );
           m_engine = (EngineClassLoader) context.get( APPLIANCE_ENGINE_KEY );
  @@ -572,7 +572,7 @@
        * @exception IllegalStateException if the operation is accessed 
        *   prior to assembly of the appliance
        */
  -    public Map getContextMap()
  +    public Map getContextMap() throws IllegalStateException
       {
           if( !m_assembled )
           {
  @@ -783,7 +783,9 @@
           // make sure that the deployment context is fully populated
           //
   
  +
           Map map = m_applianceContext.getDeploymentMap();
  +
           try
           {
               //
  
  
  

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


Mime
View raw message