mcconnell 2004/01/04 12:20:52
Modified:
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
Tag: Ver_3_4 DefaultComponentModel.java
Log:
Housekeeping.
Revision Changes Path
No revision
No revision
1.1.2.3 +4 -2
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Attic/DefaultComponentModel.java
Index: DefaultComponentModel.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Attic/DefaultComponentModel.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DefaultComponentModel.java 4 Jan 2004 20:19:27 -0000 1.1.2.2
+++ DefaultComponentModel.java 4 Jan 2004 20:20:52 -0000 1.1.2.3
@@ -161,8 +161,10 @@
if( isConfigurable() )
{
- final Configuration defaults = m_context.getType().getConfiguration();
- final Configuration explicit =
m_context.getProfile().getConfiguration();
+ final Configuration defaults =
+ m_context.getType().getConfiguration();
+ final Configuration explicit =
+ m_context.getProfile().getConfiguration();
final Configuration consolidated =
consolidateConfigurations( explicit, defaults );
if( consolidated != null )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
