Mercurial > jdk8-mips64-public > jaxws / file diff

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBDispatchMessage.java	Thu Apr 04 19:05:24 2013 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBDispatchMessage.java	Tue Apr 09 14:51:13 2013 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -26,8 +26,8 @@
    1.11  package com.sun.xml.internal.ws.message.jaxb;
    1.12  
    1.13  import com.sun.xml.internal.ws.api.SOAPVersion;
    1.14 -import com.sun.xml.internal.ws.api.message.HeaderList;
    1.15  import com.sun.xml.internal.ws.api.message.Message;
    1.16 +import com.sun.xml.internal.ws.api.message.MessageHeaders;
    1.17  import com.sun.xml.internal.ws.encoding.SOAPBindingCodec;
    1.18  import com.sun.xml.internal.ws.message.AbstractMessageImpl;
    1.19  import com.sun.xml.internal.ws.message.PayloadElementSniffer;
    1.20 @@ -114,7 +114,7 @@
    1.21      }
    1.22  
    1.23      @Override
    1.24 -    public HeaderList getHeaders() {
    1.25 +    public MessageHeaders getHeaders() {
    1.26          return null;
    1.27      }
    1.28  
    1.29 @@ -194,7 +194,7 @@
    1.30              String encoding = XMLStreamWriterUtil.getEncoding(sw);
    1.31  
    1.32              // Get output stream and use JAXB UTF-8 writer
    1.33 -            OutputStream os = XMLStreamWriterUtil.getOutputStream(sw);
    1.34 +            OutputStream os = bridge.supportOutputStream() ? XMLStreamWriterUtil.getOutputStream(sw) : null;
    1.35              if (rawContext != null) {
    1.36                  Marshaller m = rawContext.createMarshaller();
    1.37                  m.setProperty("jaxb.fragment", Boolean.FALSE);
    1.38 @@ -207,7 +207,7 @@
    1.39  
    1.40              } else {
    1.41  
    1.42 -                if (os != null && bridge.supportOutputStream() && encoding != null && encoding.equalsIgnoreCase(SOAPBindingCodec.UTF8_ENCODING)) {
    1.43 +                if (os != null && encoding != null && encoding.equalsIgnoreCase(SOAPBindingCodec.UTF8_ENCODING)) {
    1.44                      bridge.marshal(jaxbObject, os, sw.getNamespaceContext(), am);
    1.45                  } else {
    1.46                      bridge.marshal(jaxbObject, sw, am);