axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/message RPCHandler.java
Date Mon, 10 Dec 2001 20:07:10 GMT
rubys       01/12/10 12:07:10

  Modified:    java/src/org/apache/axis/message Tag: alpha-3
                        RPCHandler.java
  Log:
  Make xsi:type nil="true" not throw an exception for unknown types, just
  return a null.
  Submitted by:	Doug Davis <dug@us.ibm.com>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.20.2.1  +9 -7      xml-axis/java/src/org/apache/axis/message/RPCHandler.java
  
  Index: RPCHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/RPCHandler.java,v
  retrieving revision 1.20
  retrieving revision 1.20.2.1
  diff -u -r1.20 -r1.20.2.1
  --- RPCHandler.java	2001/12/04 20:31:07	1.20
  +++ RPCHandler.java	2001/12/10 20:07:10	1.20.2.1
  @@ -173,6 +173,11 @@
           if (category.isDebugEnabled()) {
               category.debug(JavaUtils.getMessage("typeFromAttr00", "" + type));
           }
  +
  +        String isNil = attributes.getValue(Constants.URI_2001_SCHEMA_XSI,"nil");
  +
  +        if ( isNil != null && isNil.equals("true") )
  +          return( new Deserializer() );
           
           // xsi:type always overrides everything else
           if (type == null) {
  @@ -225,18 +230,15 @@
           } else {
               dser = new Deserializer();
           }
  -        
  +
           if (dser == null) {
               throw new SAXException(JavaUtils.getMessage(
                       "noDeser01", localName,"" + type));
           }
           
  -        String isNil = attributes.getValue(Constants.URI_2001_SCHEMA_XSI, "nil");
  -        if (isNil == null || !isNil.equals("true")) {
  -            dser.registerValueTarget(
  -               new Deserializer.FieldTarget(currentParam, 
  -                   RPCParam.getValueField()));
  -        }
  +        dser.registerValueTarget(
  +             new Deserializer.FieldTarget(currentParam, 
  +                 RPCParam.getValueField()));
           
           if (category.isDebugEnabled()) {
               category.debug(JavaUtils.getMessage("exit00", "RPCHandler.onStartChild()"));
  
  
  

Mime
View raw message