You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/07/02 07:31:40 UTC
svn commit: rev 22444 - avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/data/builder
Author: mcconnell
Date: Thu Jul 1 22:31:39 2004
New Revision: 22444
Modified:
avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLComponentProfileCreator.java
Log:
Fix the entry parsing.
Modified: avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLComponentProfileCreator.java
==============================================================================
--- avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLComponentProfileCreator.java (original)
+++ avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLComponentProfileCreator.java Thu Jul 1 22:31:39 2004
@@ -287,7 +287,7 @@
throws ConfigurationException
{
final String key = conf.getAttribute( "key" );
- final String classname = conf.getAttribute( "class", "java.lang.String" );
+ final String classname = conf.getAttribute( "class", null );
if( ( null != classname ) || ( null != conf.getValue( null ) ) )
{
String value = conf.getValue( null );
@@ -326,18 +326,18 @@
}
else if( name.equals( "constructor" ) )
{
- final String classname2 =
+ final String constructorClassname =
child.getAttribute( "class", "java.lang.String" );
Configuration[] paramsConf = child.getChildren( "param" );
if( paramsConf.length > 0 )
{
Parameter[] params = getParameters( paramsConf );
- return new ConstructorDirective( key, classname2, params );
+ return new ConstructorDirective( key, constructorClassname, params );
}
else
{
return new ConstructorDirective(
- key, classname2, (String) child.getValue( null ) );
+ key, constructorClassname, (String) child.getValue( null ) );
}
}
else
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org