Merge

Thu, 14 Dec 2017 13:10:37 -0800

author
asaha
date
Thu, 14 Dec 2017 13:10:37 -0800
changeset 1563
8c7537db1706
parent 1540
0ab2d5805659
parent 1562
47bd39412b2f
child 1565
2ce3f6736106

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Dec 05 13:56:41 2017 -0800
     1.2 +++ b/.hgtags	Thu Dec 14 13:10:37 2017 -0800
     1.3 @@ -764,6 +764,10 @@
     1.4  ef939329cecb82b62d75d76debc5d67246333edd jdk8u152-b14
     1.5  199f7d9827f96ee2393f947405473b68372c0757 jdk8u152-b15
     1.6  04128156e506e8375c1c97eafea773317e5719bc jdk8u152-b16
     1.7 +52c09505e989dee9176ac0e968ee5ec18a0cee3a jdk8u152-b31
     1.8 +ddf13a1bca64ef6d12ced03f8d0065325a8f07e1 jdk8u152-b32
     1.9 +89c5dcb05c10c52ab8f6f956a061e6661f9fb6b1 jdk8u152-b33
    1.10 +46562ec770e767de1ebfe32907f32e550c8cd153 jdk8u152-b34
    1.11  eb09a34966f43c62cb286c78c10dc722fd12d884 jdk8u151-b00
    1.12  c59814f445e808150326012d911b5b4d8caa025b jdk8u151-b01
    1.13  d3dec37780f84151b08c03a6a8cba7d68bde0f80 jdk8u151-b02
     2.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/saaj/SaajStaxWriter.java	Tue Dec 05 13:56:41 2017 -0800
     2.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/saaj/SaajStaxWriter.java	Thu Dec 14 13:10:37 2017 -0800
     2.3 @@ -492,7 +492,7 @@
     2.4                      }
     2.5                      // add namespace declarations
     2.6                      for (NamespaceDeclaration namespace : this.namespaceDeclarations) {
     2.7 -                        target.addNamespaceDeclaration(namespace.prefix, namespace.namespaceUri);
     2.8 +                        newElement.addNamespaceDeclaration(namespace.prefix, namespace.namespaceUri);
     2.9                      }
    2.10                      // add attribute declarations
    2.11                      for (AttributeDeclaration attribute : this.attributeDeclarations) {

mercurial