Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jaxws
changeset 625:3cb6cf361574
Merge
author | asaha |
---|---|
date | Thu, 29 May 2014 13:41:03 -0700 |
parents | 349041c00f96 (current diff) 7753d54e23cf (diff) |
children | a76779e1b037 |
files | .hgtags |
diffstat | 4 files changed, 29 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon May 19 21:56:58 2014 -0700 +++ b/.hgtags Thu May 29 13:41:03 2014 -0700 @@ -245,7 +245,9 @@ 32050ab53c8a8e4cb09f04b88db78258a480fb61 jdk8-b121 bc622ba563f9316f981c11c3a260f4c3fdc5ef07 jdk8-b122 91f5c542ccad330efc0d281362dd6f33f2039746 jdk8-b123 +241e4effed6d4702815f54efdfb34ebd5c3990f6 jdk8u20-b00 ef71ecbcd7bc014b1be39a6d1b3a1fb663772c14 jdk8-b124 +ac679298539a4bc6c23e1ce00acabf10d1d93fe2 jdk8u20-b01 ef71ecbcd7bc014b1be39a6d1b3a1fb663772c14 jdk8-b125 7193a007a159ef9401b672af5c36c5b95e6e2943 jdk8-b126 8e46fe36e17595c24ccdbde7b34e3cbfb6056b42 jdk8-b127 @@ -277,4 +279,23 @@ c29ede8e947c365ce55174eba716050c48461576 jdk8u11-b07 ca91f03660789a75710b4a081cd32aab00e80964 jdk8u11-b08 6e994ba1e4610b367f292a41a0d2c77091f93ab6 jdk8u11-b09 +aa3f37b9fbdca195ac9430b8c301db7f33347241 jdk8u11-b10 +ba061957b8bdb5f04e58154b27405fbf6fe3c71f jdk8u20-b02 +337a3a4086235e926e1d684bf4d0b2add70d6f55 jdk8u20-b03 +579caba2483ee3c9e32d87b31ab46e86f1aa9cd3 jdk8u20-b04 +918ceef47cb401f64451ff58725210128176c6a6 jdk8u20-b05 +4195c0956930bf4e161ac6b0def0d6295bfba58f jdk8-b130 +012b935707fa24a1a88b429255f77b386e082643 jdk8-b131 +c2be0dd15dbf0c23ee693a1af32f8f6a012abd1e jdk8-b132 +515ddaddbb6402452f5c6a63594db5d7d71b5aa1 jdk8u20-b06 +a61ba2e3e6c85f7067fb7b0c3c02584abdfa96be jdk8u20-b07 +bc6d2f3426f3d04adc8245ad120e2b52fe7dfbde jdk8u20-b08 +2e76ce4ec993c32368ef51b67873aa5ff06e1437 jdk8u20-b09 +84f913145e2acb8474f3779d7ef154eebec9537a jdk8u20-b10 +ce4e5885a11012edaf76ce9a6115e23acabfd282 jdk8u20-b11 +94fbd96ebb83a3ce966c347082b079f9e4fec76a jdk8u20-b12 +9634e8ad55c9ab691325116aff765de00dfc8410 jdk8u20-b13 +796c274fbf5e71f1af1e9c3111518c057dcc95bd jdk8u20-b14 +8ef9f5f9b0c5f86f325c4aad3c6dc1ff9243ea43 jdk8u20-b15 +86741f3a4a381de18fbbfecd588660ca7a94c5ed jdk8u20-b16 efc85d318f4697f40bdd1f3757677be97f1758d9 jdk8u25-b00
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java Mon May 19 21:56:58 2014 -0700 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java Thu May 29 13:41:03 2014 -0700 @@ -177,7 +177,8 @@ throw new AbortException(); } _parameters.add(p); - _parametersByName.put(p.getName(), p); + String name = p.getCustomName() != null ? p.getCustomName() : p.getName(); + _parametersByName.put(name, p); } public Parameter getParameterByName(String name) {
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java Mon May 19 21:56:58 2014 -0700 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java Thu May 29 13:41:03 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -41,6 +41,7 @@ import java.io.ByteArrayInputStream; import java.io.StringReader; import java.io.StringWriter; +import java.nio.charset.StandardCharsets; import java.text.MessageFormat; import java.util.*; @@ -107,7 +108,7 @@ } //add w3c EPR binding if(!(options.noAddressingBbinding) && options.target.isLaterThan(Options.Target.V2_1)){ - InputSource is = new InputSource(new ByteArrayInputStream(w3ceprSchemaBinding.getBytes())); + InputSource is = new InputSource(new ByteArrayInputStream(w3ceprSchemaBinding.getBytes(StandardCharsets.UTF_8))); is.setSystemId(sysId+(++i +1)); b.schemas.add(is); }
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java Mon May 19 21:56:58 2014 -0700 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java Thu May 29 13:41:03 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, 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 @@ -1791,9 +1791,9 @@ } if (part.isIN()) { - setCustomizedParameterName(info.portTypeOperation, inMsg, part, param, false); + setCustomizedParameterName(info.bindingOperation, inMsg, part, param, false); } else if (outMsg != null) { - setCustomizedParameterName(info.portTypeOperation, outMsg, part, param, false); + setCustomizedParameterName(info.bindingOperation, outMsg, part, param, false); } params.add(param);