[jboss-cvs] jaxrpc/src/main/org/jboss/axis ...

[Alex Guizar]

  User: aguizar 
  Date: 06/07/16 19:23:39

  Modified:    src/main/org/jboss/axis   Tag: JBoss_4_0_2_JBWS-1034
                        Message.java MessagePart.java
  Log:
  JBWS-1034
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3.96.1 +4 -0      jaxrpc/src/main/org/jboss/axis/Attic/Message.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Message.java
  ===================================================================
  RCS file: /cvsroot/jboss/jaxrpc/src/main/org/jboss/axis/Attic/Message.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.3.96.1
  diff -u -b -r1.1.2.3 -r1.1.2.3.96.1
  --- Message.java	21 Apr 2005 20:24:44 -0000	1.1.2.3
  +++ Message.java	16 Jul 2006 23:23:38 -0000	1.1.2.3.96.1
  @@ -498,6 +498,10 @@
            {
               ret = HTTPConstants.HEADER_ACCEPT_APPL_SOAP + "; charset=" + encoding;
            }
  +         else if (envelope.getSOAPConstants() == SOAPConstants.SOAP11_CONSTANTS) 
  +         {
  +            ret = "text/xml; charset=" + encoding;
  +         }
         }
   
         if (mAttachments != null && 0 != mAttachments.getAttachmentCount())
  
  
  
  1.1.2.3.96.1 +33 -1     jaxrpc/src/main/org/jboss/axis/Attic/MessagePart.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MessagePart.java
  ===================================================================
  RCS file: /cvsroot/jboss/jaxrpc/src/main/org/jboss/axis/Attic/MessagePart.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.3.96.1
  diff -u -b -r1.1.2.3 -r1.1.2.3.96.1
  --- MessagePart.java	14 Apr 2005 21:37:10 -0000	1.1.2.3
  +++ MessagePart.java	16 Jul 2006 23:23:39 -0000	1.1.2.3.96.1
  @@ -547,7 +547,23 @@
            currentMessageAsBytes = (byte[])currentMessage;
            try
            {
  -            setCurrentForm(new String((byte[])currentMessage, "UTF-8"), FORM_STRING);
  +            // set encoding of string from parent.
  +            String encoding = null;
  +            if (msgObject != null)
  +            {
  +               try
  +               {
  +                  encoding = (String)msgObject.getProperty(SOAPMessage.CHARACTER_SET_ENCODING);
  +               }
  +               catch (SOAPException e)
  +               {
  +               }
  +            }
  +            if (encoding == null)
  +            {
  +               encoding = "UTF-8";
  +            }
  +            setCurrentForm(new String((byte[])currentMessage, encoding), FORM_STRING);
            }
            catch (UnsupportedEncodingException ue)
            {
  @@ -668,6 +684,22 @@
         else if (currentForm == FORM_BYTES)
         {
            is = new InputSource(new ByteArrayInputStream((byte[])currentMessage));
  +         // set encoding of input source from parent.
  +         String encoding = null;
  +         if (msgObject != null)
  +         {
  +            try
  +            {
  +               encoding = (String)msgObject.getProperty(SOAPMessage.CHARACTER_SET_ENCODING);
  +            }
  +            catch (SOAPException e)
  +            {
  +            }
  +         }
  +         if (encoding != null)
  +         {
  +            is.setEncoding(encoding);
  +         }
         }
         else
         {