Re: cvs commit: jakarta-struts/src/share/org/apache/struts/util ConvertUtils.java

2001-09-17 Thread Ted Husted 

Should we also apply this to the Commons version? 

If it was just an oversight, I can do it.

-Ted.

[EMAIL PROTECTED] wrote:
 
 martinc 01/09/14 22:02:20
 
   Modified:src/share/org/apache/struts/util Tag: STRUTS_1_0_BRANCH
 ConvertUtils.java
   Log:
   Convert character values correctly.
   PR: 2494
   Submitted by: Olav Reinert - thanks!
 
   Revision  ChangesPath
   No   revision
 
 
   No   revision
 
 
   1.8.2.1   +6 -8  
jakarta-struts/src/share/org/apache/struts/util/Attic/ConvertUtils.java
 
   Index: ConvertUtils.java
   ===
   RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/Attic/ConvertUtils.java,v
   retrieving revision 1.8
   retrieving revision 1.8.2.1
   diff -u -r1.8 -r1.8.2.1
   --- ConvertUtils.java 2001/05/20 01:18:27 1.8
   +++ ConvertUtils.java 2001/09/15 05:02:20 1.8.2.1
   @@ -1,7 +1,7 @@
/*
   - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/Attic/ConvertUtils.java,v 
1.8 2001/05/20 01:18:27 craigmcc Exp $
   - * $Revision: 1.8 $
   - * $Date: 2001/05/20 01:18:27 $
   + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/Attic/ConvertUtils.java,v 
1.8.2.1 2001/09/15 05:02:20 martinc Exp $
   + * $Revision: 1.8.2.1 $
   + * $Date: 2001/09/15 05:02:20 $
 *
 * 
 *
   @@ -80,7 +80,7 @@
 * @author Craig R. McClanahan
 * @author Ralph Schaer
 * @author Chris Audley
   - * @version $Revision: 1.8 $ $Date: 2001/05/20 01:18:27 $
   + * @version $Revision: 1.8.2.1 $ $Date: 2001/09/15 05:02:20 $
 */
 
public class ConvertUtils {
   @@ -467,12 +467,10 @@
private static Character convertCharacter(String value,
  Character defaultValue) {
 
   -if (value == null)
   +if (value == null || value.length() == 0)
return (defaultValue);
   -else if (value.length() == 0)
   -return (new Character(' '));
else
   -return (defaultValue);
   +return (new Character(value.charAt(0)));
 
}

cvs commit: jakarta-struts/src/share/org/apache/struts/util ConvertUtils.java

2001-09-14 Thread martinc 

martinc 01/09/14 22:02:20

  Modified:src/share/org/apache/struts/util Tag: STRUTS_1_0_BRANCH
ConvertUtils.java
  Log:
  Convert character values correctly.
  PR: 2494
  Submitted by: Olav Reinert - thanks!
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.8.2.1   +6 -8  
jakarta-struts/src/share/org/apache/struts/util/Attic/ConvertUtils.java
  
  Index: ConvertUtils.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/Attic/ConvertUtils.java,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- ConvertUtils.java 2001/05/20 01:18:27 1.8
  +++ ConvertUtils.java 2001/09/15 05:02:20 1.8.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/Attic/ConvertUtils.java,v 
1.8 2001/05/20 01:18:27 craigmcc Exp $
  - * $Revision: 1.8 $
  - * $Date: 2001/05/20 01:18:27 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/Attic/ConvertUtils.java,v 
1.8.2.1 2001/09/15 05:02:20 martinc Exp $
  + * $Revision: 1.8.2.1 $
  + * $Date: 2001/09/15 05:02:20 $
*
* 
*
  @@ -80,7 +80,7 @@
* @author Craig R. McClanahan
* @author Ralph Schaer
* @author Chris Audley
  - * @version $Revision: 1.8 $ $Date: 2001/05/20 01:18:27 $
  + * @version $Revision: 1.8.2.1 $ $Date: 2001/09/15 05:02:20 $
*/
   
   public class ConvertUtils {
  @@ -467,12 +467,10 @@
   private static Character convertCharacter(String value,
 Character defaultValue) {
   
  -if (value == null)
  +if (value == null || value.length() == 0)
   return (defaultValue);
  -else if (value.length() == 0)
  -return (new Character(' '));
   else
  -return (defaultValue);
  +return (new Character(value.charAt(0)));
   
   }