You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by eb...@apache.org on 2004/09/21 19:58:10 UTC

cvs commit: jakarta-commons/configuration/src/java/org/apache/commons/configuration/beanutils ConfigurationDynaBean.java

ebourg      2004/09/21 10:58:10

  Modified:    configuration/src/java/org/apache/commons/configuration
                        AbstractConfiguration.java
               configuration/xdocs changes.xml
               configuration/src/java/org/apache/commons/configuration/beanutils
                        ConfigurationDynaBean.java
  Log:
  Replaced the calls to Boolean.booleanValue(boolean) in AbstractConfiguration and ConfigurationDynaBean to be Java 1.3 compatible (bug 31346)
  
  Revision  Changes    Path
  1.24      +2 -2      jakarta-commons/configuration/src/java/org/apache/commons/configuration/AbstractConfiguration.java
  
  Index: AbstractConfiguration.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/configuration/src/java/org/apache/commons/configuration/AbstractConfiguration.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- AbstractConfiguration.java	20 Sep 2004 09:37:07 -0000	1.23
  +++ AbstractConfiguration.java	21 Sep 2004 17:58:10 -0000	1.24
  @@ -433,7 +433,7 @@
        */
       public boolean getBoolean(String key, boolean defaultValue)
       {
  -        return getBoolean(key, Boolean.valueOf(defaultValue)).booleanValue();
  +        return getBoolean(key, BooleanUtils.toBooleanObject(defaultValue)).booleanValue();
       }
   
       /**
  
  
  
  1.45      +5 -0      jakarta-commons/configuration/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/configuration/xdocs/changes.xml,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- changes.xml	21 Sep 2004 17:18:27 -0000	1.44
  +++ changes.xml	21 Sep 2004 17:58:10 -0000	1.45
  @@ -7,6 +7,11 @@
   
     <body>
       <release version="1.0-rc2" date="in CVS">
  +      <action dev="ebourg" type="fix" issue="31346">
  +        Replaced the calls to Boolean.booleanValue(boolean) in
  +        AbstractConfiguration and ConfigurationDynaBean to be Java 1.3
  +        compatible.
  +      </action>
         <action dev="ebourg" type="fix" issue="31345">
           Changing the prefix of a JNDIConfiguration will now reset the base context used.
         </action>
  
  
  
  1.7       +8 -3      jakarta-commons/configuration/src/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java
  
  Index: ConfigurationDynaBean.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/configuration/src/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ConfigurationDynaBean.java	21 Sep 2004 17:49:39 -0000	1.6
  +++ ConfigurationDynaBean.java	21 Sep 2004 17:58:10 -0000	1.7
  @@ -23,6 +23,7 @@
   import org.apache.commons.beanutils.DynaClass;
   import org.apache.commons.configuration.Configuration;
   import org.apache.commons.configuration.ConversionException;
  +import org.apache.commons.lang.BooleanUtils;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   
  @@ -53,7 +54,11 @@
   
       public ConfigurationDynaBean(Configuration configuration)
       {
  -        if (log.isTraceEnabled()) log.trace("ConfigurationDynaBean(" + configuration + ")");
  +        if (log.isTraceEnabled())
  +        {
  +            log.trace("ConfigurationDynaBean(" + configuration + ")");
  +        }
  +        
           this.configuration = configuration;
       }
   
  @@ -94,7 +99,7 @@
               boolean[] array = (boolean[]) value;
               for (int i = 0; i < array.length; i++)
               {
  -                configuration.addProperty(name, Boolean.valueOf(array[i]));
  +                configuration.addProperty(name, BooleanUtils.toBooleanObject(array[i]));
               }
           }
           else if (value instanceof char[])
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org