axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: ws-axis/java/src/org/apache/axis/encoding SerializationContext.java
Date Mon, 22 Nov 2004 23:59:50 GMT
dims        2004/11/22 15:59:50

  Modified:    java/src/org/apache/axis/encoding SerializationContext.java
  Log:
  Fix for AXIS-1668 - SerializationContext does not force xsi:type when the WSDLJava generated
metadata, and shouldSendType=false
  from Steve Green <steveg@epok.net>
  
  Revision  Changes    Path
  1.97      +6 -1      ws-axis/java/src/org/apache/axis/encoding/SerializationContext.java
  
  Index: SerializationContext.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/SerializationContext.java,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- SerializationContext.java	15 Nov 2004 05:26:07 -0000	1.96
  +++ SerializationContext.java	22 Nov 2004 23:59:50 -0000	1.97
  @@ -1362,7 +1362,12 @@
                   TypeDesc typedesc = TypeDesc.getTypeDescForClass(value.getClass());
                   if (typedesc != null) {
                       QName qname = typedesc.getXmlType();
  -                    if (shouldSendType && qname != null) {
  +		    // Send the xmlType if indicated or if
  +		    // the actual xmlType is different than the
  +		    // prefered xmlType
  +                    if (shouldSendType ||
  +		        (xmlType != null && qname != null &&
  +			 (!xmlType.equals(qname)))) {
                           writeXMLType = qname;
                       }
                   }
  
  
  

Mime
View raw message