svn commit: rev 43608 - avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl

Author: hammett
Date: Thu Sep  9 08:00:28 2004
New Revision: 43608

Modified:
   avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/Commissioner.java
   avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
Log:
Peter Neubauer's patch applied.

Modified: avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/Commissioner.java
==============================================================================
--- avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/Commissioner.java	(original)
+++ avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/Commissioner.java	Thu Sep  9 08:00:28 2004
@@ -131,11 +131,11 @@
                       + "]" );
                 }
             }
-
+	       
             CommissionRequest request = 
               new CommissionRequest( model, m_thread );
-            m_queue.put( request );
-            long t = request.waitForCompletion();
+           m_queue.put( request );
+          long t = request.waitForCompletion();
             if( m_logger.isDebugEnabled() )
             {
                 m_logger.debug( 
@@ -180,7 +180,7 @@
                 DeploymentModel model = request.getDeploymentModel();
                 try
                 {
-                    if( m_flag )
+                   if( m_flag )
                     {
                         model.commission();
                     }

Modified: avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
==============================================================================
--- avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java	(original)
+++ avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java	Thu Sep  9 08:00:28 2004
@@ -207,7 +207,6 @@
     public void commission() throws Exception
     {
         assemble();
-
         synchronized( m_commissioned )
         {
             if( m_commissioned.isEnabled() ) return;
@@ -217,9 +216,8 @@
             // we locate the locally scoped models 
             // and deploy them
             //
-            
             DeploymentModel[] startup = getStartupGraph();
-
+            
             Commissioner commissioner = 
               new Commissioner( getLogger(), true );
 
@@ -235,7 +233,7 @@
             {
                 commissioner.dispose();
             }
-
+            
             //
             // all subsidary model and runtime structures are not
             // fully commissioned and we can proceed with the