Sun, 18 Jun 2017 23:18:45 +0100
8172297: In java 8, the marshalling with JAX-WS does not escape carriage return
Reviewed-by: lancea
aoqi@0 | 1 | /* |
aefimov@1443 | 2 | * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. |
aoqi@0 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
aoqi@0 | 4 | * |
aoqi@0 | 5 | * This code is free software; you can redistribute it and/or modify it |
aoqi@0 | 6 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@0 | 7 | * published by the Free Software Foundation. Oracle designates this |
aoqi@0 | 8 | * particular file as subject to the "Classpath" exception as provided |
aoqi@0 | 9 | * by Oracle in the LICENSE file that accompanied this code. |
aoqi@0 | 10 | * |
aoqi@0 | 11 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@0 | 12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@0 | 13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@0 | 14 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@0 | 15 | * accompanied this code). |
aoqi@0 | 16 | * |
aoqi@0 | 17 | * You should have received a copy of the GNU General Public License version |
aoqi@0 | 18 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@0 | 19 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
aoqi@0 | 20 | * |
aoqi@0 | 21 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@0 | 22 | * or visit www.oracle.com if you need additional information or have any |
aoqi@0 | 23 | * questions. |
aoqi@0 | 24 | */ |
aoqi@0 | 25 | |
aoqi@0 | 26 | package com.sun.xml.internal.bind.v2.runtime.output; |
aoqi@0 | 27 | |
aoqi@0 | 28 | import javax.xml.stream.XMLStreamException; |
aoqi@0 | 29 | |
aefimov@1443 | 30 | import com.sun.xml.internal.bind.marshaller.NoEscapeHandler; |
aoqi@0 | 31 | import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Base64Data; |
aoqi@0 | 32 | |
aoqi@0 | 33 | import com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx; |
aoqi@0 | 34 | |
aoqi@0 | 35 | /** |
aoqi@0 | 36 | * {@link XmlOutput} for {@link XMLStreamWriterEx}. |
aoqi@0 | 37 | * |
aoqi@0 | 38 | * @author Paul Sandoz. |
aoqi@0 | 39 | */ |
aoqi@0 | 40 | public final class StAXExStreamWriterOutput extends XMLStreamWriterOutput { |
aoqi@0 | 41 | private final XMLStreamWriterEx out; |
aoqi@0 | 42 | |
aoqi@0 | 43 | public StAXExStreamWriterOutput(XMLStreamWriterEx out) { |
aefimov@1443 | 44 | super(out, NoEscapeHandler.theInstance); |
aoqi@0 | 45 | this.out = out; |
aoqi@0 | 46 | } |
aoqi@0 | 47 | |
aoqi@0 | 48 | public void text(Pcdata value, boolean needsSeparatingWhitespace) throws XMLStreamException { |
aoqi@0 | 49 | if(needsSeparatingWhitespace) { |
aoqi@0 | 50 | out.writeCharacters(" "); |
aoqi@0 | 51 | } |
aoqi@0 | 52 | |
aoqi@0 | 53 | if (!(value instanceof Base64Data)) { |
aoqi@0 | 54 | out.writeCharacters(value.toString()); |
aoqi@0 | 55 | } else { |
aoqi@0 | 56 | Base64Data v = (Base64Data)value; |
aoqi@0 | 57 | out.writeBinary(v.getDataHandler()); |
aoqi@0 | 58 | } |
aoqi@0 | 59 | } |
aoqi@0 | 60 | } |