axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/encoding/ser BeanDeserializer.java
Date Wed, 01 May 2002 22:06:47 GMT
tomj        02/05/01 15:06:47

  Modified:    java/src/org/apache/axis/encoding/ser BeanDeserializer.java
  Log:
  Back out previous change (for now) which prevents the WSDL multiref
  test from running.
  
  Revision  Changes    Path
  1.22      +19 -7     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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- BeanDeserializer.java	1 May 2002 19:52:46 -0000	1.21
  +++ BeanDeserializer.java	1 May 2002 22:06:47 -0000	1.22
  @@ -113,6 +113,16 @@
               BeanPropertyDescriptor descriptor = pd[i];
               propertyMap.put(descriptor.getName(), descriptor);
           }
  +        // create a value
  +        try {
  +            value=javaType.newInstance();
  +        } catch (Exception e) {
  +/*
  +            throw new SAXException(JavaUtils.getMessage("cantCreateBean00", 
  +                                                        javaType.getName(), 
  +                                                        e.toString()));
  +*/
  +        }
       }
   
       /**
  @@ -255,13 +265,15 @@
                                  DeserializationContext context)
               throws SAXException {
   
  -        // create a value
  -        try {
  -            value=javaType.newInstance();
  -        } catch (Exception e) {
  -            throw new SAXException(JavaUtils.getMessage("cantCreateBean00", 
  -                                                  javaType.getName(), 
  -                                                  e.toString()));
  +        if (value == null) {
  +            // create a value
  +            try {
  +                value=javaType.newInstance();
  +            } catch (Exception e) {
  +                throw new SAXException(JavaUtils.getMessage("cantCreateBean00", 
  +                                                            javaType.getName(), 
  +                                                            e.toString()));
  +            }
           }
   
           // If no type description meta data, there are no attributes,
  
  
  

Mime
View raw message