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/05/08 16:05:07 UTC

cvs commit: avalon/framework/impl/src/java/org/apache/avalon/framework/configuration ConfigurationUtil.java

mcconnell    2004/05/08 07:05:07

  Modified:    framework/impl/src/java/org/apache/avalon/framework/configuration
                        ConfigurationUtil.java
  Log:
  Correct problem identified under http://nagoya.apache.org/jira/browse/AVALON-3
  
  Revision  Changes    Path
  1.18      +5 -3      avalon/framework/impl/src/java/org/apache/avalon/framework/configuration/ConfigurationUtil.java
  
  Index: ConfigurationUtil.java
  ===================================================================
  RCS file: /home/cvs/avalon/framework/impl/src/java/org/apache/avalon/framework/configuration/ConfigurationUtil.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ConfigurationUtil.java	11 Feb 2004 14:34:25 -0000	1.17
  +++ ConfigurationUtil.java	8 May 2004 14:05:07 -0000	1.18
  @@ -66,7 +66,8 @@
               configuration.setAttribute( name, value );
           }
   
  -        String content = null;
  +        boolean flag = false;
  +        String content = "";
           final NodeList nodes = element.getChildNodes();
           final int count = nodes.getLength();
           for( int i = 0; i < count; i++ )
  @@ -81,10 +82,11 @@
               {
                   final CharacterData data = (CharacterData)node;
                   content += data.getData();
  +                flag = true;
               }
           }
   
  -        if( null != content )
  +        if( flag )
           {
               configuration.setValue( content );
           }
  
  
  

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