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

[email protected] 9 Sep 2004 15:06:29 -0000
Newsgroups gmane.comp.jakarta.avalon.cvs
Message-ID <[email protected]>
Author: hammett
Date: Thu Sep  9 08:06:28 2004
New Revision: 43609

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:
modified   impl/Commissioner.java
modified   impl/DefaultContainmentModel.java
Now properly 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:06:28 2004
@@ -64,10 +64,15 @@
 
     Commissioner( Logger logger, boolean flag )
     {
+        this( logger, flag, "unnamed" );
+    }
+
+    Commissioner( Logger logger, boolean flag, String tag )
+    {
         m_logger = logger;
         m_ThreadCounter++;
         final String name = 
-          "Commissioner [" + m_ThreadCounter + "]";
+          "Commissioner [" + tag + ", " + m_ThreadCounter + "]";
         m_flag = flag;
         if( flag ) 
         {

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:06:28 2004
@@ -219,7 +219,7 @@
             DeploymentModel[] startup = getStartupGraph();
             
             Commissioner commissioner = 
-              new Commissioner( getLogger(), true );
+              new Commissioner( getLogger(), true, this.getName() );
 
             try
             {