You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by to...@apache.org on 2002/01/14 22:27:14 UTC

cvs commit: xml-axis/java/src/org/apache/axis/utils JavaUtils.java

tomj        02/01/14 13:27:14

  Modified:    java/src/org/apache/axis/utils JavaUtils.java
  Log:
  In xmlNameToJava:
    - Add some protection code to prevent ungracefull error handling.
    - Use local variable length variable instead of function call, since it wasl already defined.
  
  Revision  Changes    Path
  1.21      +10 -6     xml-axis/java/src/org/apache/axis/utils/JavaUtils.java
  
  Index: JavaUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/JavaUtils.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- JavaUtils.java	12 Jan 2002 16:31:37 -0000	1.20
  +++ JavaUtils.java	14 Jan 2002 21:27:14 -0000	1.21
  @@ -272,17 +272,21 @@
        */
       public static String xmlNameToJava(String name)
       {
  +        // protect ourselves from garbage
  +        if (name == null || name.equals(""))
  +            return name;
  +        
           char[] nameArray = name.toCharArray();
  -        int len = name.length();
  -        StringBuffer result = new StringBuffer(len);
  +        int nameLen = name.length();
  +        StringBuffer result = new StringBuffer(nameLen);
           
           // First character, lower case
           int i = 0;
  -        while (i < name.length() 
  +        while (i < nameLen
                   && !Character.isLetter(nameArray[i])) {
               i++;
           }
  -        if (i < name.length()) {
  +        if (i < nameLen) {
               result.append(Character.toLowerCase(nameArray[i]));
           }
           else {
  @@ -291,10 +295,10 @@
           
           // The rest of the string
           boolean wordStart = false;
  -        for(int j = i + 1; j < len; ++j) {
  +        for(int j = i + 1; j < nameLen; ++j) {
               char c = nameArray[j];
   
  -            // if this is a bad char, skip it a remember to capitolize next
  +            // if this is a bad char, skip it a remember to capitalize next
               // good character we encounter
               if( !Character.isLetterOrDigit(c)) {
                   wordStart = true;