cvs commit: xml-axis/java/src/org/apache/axis/encoding/ser BeanDeserializer.java

[tomj]

tomj        02/02/06 12:58:01

  Modified:    java/src/org/apache/axis/encoding/ser BeanDeserializer.java
  Log:
  Check the Java mangled XML name when looking for bean elements.
  
  WSDL2Java mangles the element names per JAX-RPC, but we wont find those names
  in the XML we process.  This change lets us find them.
  
  Revision  Changes    Path
  1.2       +3 -1      
xml-axis/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java
  
  Index: BeanDeserializer.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BeanDeserializer.java     26 Jan 2002 02:40:34 -0000      1.1
  +++ BeanDeserializer.java     6 Feb 2002 20:58:00 -0000       1.2
  @@ -144,10 +144,12 @@
           // capitalization of the first character.
           String localNameUp = BeanSerializer.format(localName, 
BeanSerializer.FORCE_UPPER);
           String localNameLo = BeanSerializer.format(localName, 
BeanSerializer.FORCE_LOWER);
  +        String mangledName = JavaUtils.xmlNameToJava(localName);
           for (int i=0; i<pd.length; i++) {
               if (pd[i].getWriteMethod() == null ) continue ;
               if (pd[i].getName().equals(localNameUp) ||
  -                pd[i].getName().equals(localNameLo)) {
  +                pd[i].getName().equals(localNameLo) ||
  +                pd[i].getName().equals(mangledName)) {
   
                   // determine the QName for this child element
                   TypeMapping tm = context.getTypeMapping();