You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2004/06/30 18:10:28 UTC

cvs commit: ws-axis/java/src/org/apache/axis Message.java

dims        2004/06/30 09:10:28

  Modified:    java/src/org/apache/axis Message.java
  Log:
  avoid unnecessary byte->string conversion.
  
  Revision  Changes    Path
  1.116     +11 -4     ws-axis/java/src/org/apache/axis/Message.java
  
  Index: Message.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/Message.java,v
  retrieving revision 1.115
  retrieving revision 1.116
  diff -u -r1.115 -r1.116
  --- Message.java	11 May 2004 01:17:43 -0000	1.115
  +++ Message.java	30 Jun 2004 16:10:28 -0000	1.116
  @@ -449,11 +449,18 @@
        */
       public String getContentType(SOAPConstants sc) throws AxisFault {
           boolean soap12 = false;
  -        // Support of SOAP 1.2 HTTP binding
  -        SOAPEnvelope envelope = getSOAPEnvelope();
  -        if (envelope != null) {
  -            if (envelope.getSOAPConstants() == SOAPConstants.SOAP12_CONSTANTS) {
  +        
  +        if(sc != null) {
  +            if(sc == SOAPConstants.SOAP12_CONSTANTS) {
                   soap12 = true;
  +            }
  +        } else {
  +            // Support of SOAP 1.2 HTTP binding
  +            SOAPEnvelope envelope = getSOAPEnvelope();
  +            if (envelope != null) {
  +                if (envelope.getSOAPConstants() == SOAPConstants.SOAP12_CONSTANTS) {
  +                    soap12 = true;
  +                }
               }
           }