Tue, 08 Apr 2014 11:26:40 +0100
8033113: wsimport fails on WSDL:header parameter name customization
Reviewed-by: chegar
1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java Fri Apr 11 09:35:28 2014 -0700 1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java Tue Apr 08 11:26:40 2014 +0100 1.3 @@ -177,7 +177,8 @@ 1.4 throw new AbortException(); 1.5 } 1.6 _parameters.add(p); 1.7 - _parametersByName.put(p.getName(), p); 1.8 + String name = p.getCustomName() != null ? p.getCustomName() : p.getName(); 1.9 + _parametersByName.put(name, p); 1.10 } 1.11 1.12 public Parameter getParameterByName(String name) {
2.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java Fri Apr 11 09:35:28 2014 -0700 2.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java Tue Apr 08 11:26:40 2014 +0100 2.3 @@ -1,5 +1,5 @@ 2.4 /* 2.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 2.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. 2.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.8 * 2.9 * This code is free software; you can redistribute it and/or modify it 2.10 @@ -1791,9 +1791,9 @@ 2.11 } 2.12 2.13 if (part.isIN()) { 2.14 - setCustomizedParameterName(info.portTypeOperation, inMsg, part, param, false); 2.15 + setCustomizedParameterName(info.bindingOperation, inMsg, part, param, false); 2.16 } else if (outMsg != null) { 2.17 - setCustomizedParameterName(info.portTypeOperation, outMsg, part, param, false); 2.18 + setCustomizedParameterName(info.bindingOperation, outMsg, part, param, false); 2.19 } 2.20 2.21 params.add(param);