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

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java	Tue Apr 24 12:17:05 2018 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java	Mon Apr 23 13:24:44 2018 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2018, 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,6 +26,7 @@
    1.11  package com.sun.xml.internal.ws.streaming;
    1.12  
    1.13  import com.sun.istack.internal.Nullable;
    1.14 +import com.sun.xml.internal.ws.api.streaming.XMLStreamWriterFactory;
    1.15  import com.sun.xml.internal.ws.encoding.HasEncoding;
    1.16  import com.sun.xml.internal.ws.encoding.SOAPBindingCodec;
    1.17  
    1.18 @@ -57,9 +58,15 @@
    1.19      public static @Nullable OutputStream getOutputStream(XMLStreamWriter writer) throws XMLStreamException {
    1.20          Object obj = null;
    1.21  
    1.22 +        XMLStreamWriter xmlStreamWriter =
    1.23 +                writer instanceof XMLStreamWriterFactory.HasEncodingWriter ?
    1.24 +                        ((XMLStreamWriterFactory.HasEncodingWriter) writer).getWriter()
    1.25 +                        : writer;
    1.26 +
    1.27 +
    1.28          // Hack for JDK6's SJSXP
    1.29 -        if (writer instanceof Map) {
    1.30 -            obj = ((Map) writer).get("sjsxp-outputstream");
    1.31 +        if (xmlStreamWriter instanceof Map) {
    1.32 +            obj = ((Map) xmlStreamWriter).get("sjsxp-outputstream");
    1.33          }
    1.34  
    1.35          // woodstox