Mailing-List: contact axis-dev-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: axis-dev@xml.apache.org
Date: 22 Jul 2002 14:54:47 -0000
Message-ID: <20020722145447.19970.qmail@icarus.apache.org>
From: gdaniels@apache.org
To: xml-axis-cvs@apache.org
Subject: cvs commit: xml-axis/java/src/org/apache/axis/encoding/ser
 BeanDeserializer.java

gdaniels    2002/07/22 07:54:47

  Modified:    java/src/org/apache/axis/encoding/ser BeanDeserializer.java
  Log:
  Remove dead code per TODO.
  
  Revision  Changes    Path
  1.39      +0 -28     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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- BeanDeserializer.java	22 Jul 2002 06:23:01 -0000	1.38
  +++ BeanDeserializer.java	22 Jul 2002 14:54:47 -0000	1.39
  @@ -225,34 +225,6 @@
               propDesc = (BeanPropertyDescriptor) propertyMap.get(localName);
           }
   
  -        // Currently the meta data does not consider inheritance.
  -        // Glen is working on a fix.  In the meantime, the following 
  -        // code attempts to get the meta data from the base class.  
  -        // (this fix does not work in all cases, but is necessary to 
  -        // get comprehensive tests Animal - Cat inheritance to work).
  -        if (propDesc == null) { 
  -            Class superClass = javaType;
  -            while (superClass != null && propDesc == null) {
  -                superClass = superClass.getSuperclass(); 
  -                if (superClass != null) {
  -                    TypeDesc td = TypeDesc.getTypeDescForClass(superClass);
  -                    if (td != null) {
  -                        String fieldName = 
  -                            td.getFieldNameForElement(elemQName, 
  -                                                      false);
  -                        if (fieldName == null && 
  -                            (prefix == null || prefix.equals(""))) {
  -                            fieldName = 
  -                                td.getFieldNameForElement(
  -                                new QName("", elemQName.getLocalPart()), false);
  -                        }
  -                        
  -                        propDesc = 
  -                            (BeanPropertyDescriptor)propertyMap.get(fieldName);
  -                    }
  -                }
  -            }
  -        }
           // try and see if this is an xsd:any namespace="##any" element before reporting a problem
           QName qn = null;
           Deserializer dSer = null;