jdk8-mips64-public/jaxws: comparison src/share/jaxws_classes/com/sun/xml/internal/ws/message/source/SourceUtils.java

-:8c0b6bccfe47
+:0989ad8c0860
 /*
-* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 */
 final class SourceUtils {
 int srcType;
-private final int domSource = 1;
+private static final int domSource = 1;
-private final int streamSource = 2;
+private static final int streamSource = 2;
-private final int saxSource=4;
+private static final int saxSource=4;
 public SourceUtils(Source src) {
 if(src instanceof StreamSource){
 srcType = streamSource;
 }else if(src instanceof DOMSource){
 public QName sniff(Source src, RootElementSniffer sniffer){
 String localName = null;
 String namespaceUri = null;
 if(isDOMSource()){
-DOMSource domSource = (DOMSource)src;
+DOMSource domSrc = (DOMSource)src;
-Node n = domSource.getNode();
+Node n = domSrc.getNode();
 if(n.getNodeType()== Node.DOCUMENT_NODE) {
 n = ((Document)n).getDocumentElement();
 }
 localName = n.getLocalName();
 namespaceUri = n.getNamespaceURI();
 writer.writeStartElement(localName);
 } else {
 writer.writeStartElement(uri, localName);
 }
 } else {
-assert uri != null;
+//                        assert uri != null;
 if(prefix.length() > 0){
 /**
 * Before we write the
 */
 String writerURI = null;
-if (writer.getNamespaceContext() != null)
+if (writer.getNamespaceContext() != null) {
 writerURI = writer.getNamespaceContext().getNamespaceURI(prefix);
+}
 String writerPrefix = writer.getPrefix(uri);
 if(declarePrefix(prefix, uri, writerPrefix, writerURI)){
 writer.writeStartElement(prefix, localName, uri);
 writer.setPrefix(prefix, uri != null ? uri : "");
 writer.writeNamespace(prefix, uri);
 int n = reader.getNamespaceCount();
 // Write namespace declarations
 for (int i = 0; i < n; i++) {
 String nsPrefix = reader.getNamespacePrefix(i);
-if (nsPrefix == null) nsPrefix = "";
+if (nsPrefix == null) {
+nsPrefix = "";
+}
 // StAX returns null for default ns
 String writerURI = null;
-if (writer.getNamespaceContext() != null)
+if (writer.getNamespaceContext() != null) {
 writerURI = writer.getNamespaceContext().getNamespaceURI(nsPrefix);
+}
 // Zephyr: Why is this returning null?
 // Compare nsPrefix with prefix because of [1] (above)
 String readerURI = reader.getNamespaceURI(i);
 case XMLStreamConstants.END_ELEMENT:
 writer.writeEndElement();
 break;
 case XMLStreamConstants.CHARACTERS:
 writer.writeCharacters(reader.getText());
+break;
+default:
+break;
 }
 } while (state != XMLStreamConstants.END_DOCUMENT);
 reader.close();
 }
 * @param writer
 * @throws XMLStreamException
 */
 private static void setUndeclaredPrefix(String prefix, String readerURI, XMLStreamWriter writer) throws XMLStreamException {
 String writerURI = null;
-if (writer.getNamespaceContext() != null)
+if (writer.getNamespaceContext() != null) {
 writerURI = writer.getNamespaceContext().getNamespaceURI(prefix);
+}
 if (writerURI == null) {
 writer.setPrefix(prefix, readerURI != null ? readerURI : "");
 writer.writeNamespace(prefix, readerURI != null ? readerURI : "");
 }
 * @param wPrefix
 * @param wUri
 */
 private static boolean declarePrefix(String rPrefix, String rUri, String wPrefix, String wUri){
 if (wUri == null ||((wPrefix != null) && !rPrefix.equals(wPrefix))||
-(rUri != null && !wUri.equals(rUri)))
+(rUri != null && !wUri.equals(rUri))) {
 return true;
+}
 return false;
 }
 }

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

comparison: src/share/jaxws_classes/com/sun/xml/internal/ws/message/source/SourceUtils.java

src/share/jaxws_classes/com/sun/xml/internal/ws/message/source/SourceUtils.java