axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jayachan...@apache.org
Subject svn commit: r366493 - /webservices/axis/trunk/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java
Date Fri, 06 Jan 2006 12:44:01 GMT
Author: jayachandra
Date: Fri Jan  6 04:43:46 2006
New Revision: 366493

URL: http://svn.apache.org/viewcvs?rev=366493&view=rev
Log:
Placing the if-block added in rev #357625 at the right place, so that test.wsdl.any doesn't
break.

Modified:
    webservices/axis/trunk/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java

Modified: webservices/axis/trunk/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java?rev=366493&r1=366492&r2=366493&view=diff
==============================================================================
--- webservices/axis/trunk/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java (original)
+++ webservices/axis/trunk/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java Fri
Jan  6 04:43:46 2006
@@ -207,17 +207,6 @@
            }
         }
 
-        if (propDesc == null) {
-            // look for a field by this name.
-            propDesc = (BeanPropertyDescriptor) propertyMap.get(localName);
-            if (propDesc == null) {
-                String malformedLocalName = StringUtils.makeQNameToMatchLocalName(localName);
-                if (malformedLocalName != null) {
-                    propDesc = (BeanPropertyDescriptor) propertyMap.get(malformedLocalName);
-                }
-            }
-        }
-
         // try and see if this is an xsd:any namespace="##any" element before
         // reporting a problem
         if (propDesc == null || 
@@ -259,6 +248,16 @@
             }
         }
 
+        if (propDesc == null) {
+            // look for a field by this name.
+            propDesc = (BeanPropertyDescriptor) propertyMap.get(localName);
+            if (propDesc == null) {
+                String malformedLocalName = StringUtils.makeQNameToMatchLocalName(localName);
+                if (malformedLocalName != null) {
+                    propDesc = (BeanPropertyDescriptor) propertyMap.get(malformedLocalName);
+                }
+            }
+        }
 
         if (propDesc == null) {
             // No such field



Mime
View raw message