diff options
author | mkos <none@none> | 2014-04-08 11:26:40 +0100 |
---|---|---|
committer | mkos <none@none> | 2014-04-08 11:26:40 +0100 |
commit | 6f458a3fc74aec885dcfbdded54082bbc5640f5b (patch) | |
tree | 1f98f2714d2f62a4ec3f1d088cecccb35ed51f63 /src | |
parent | e00c5e193d425bd8980a381742323f776e4ae493 (diff) | |
download | jdk8u_jaxws-6f458a3fc74aec885dcfbdded54082bbc5640f5b.tar.gz |
8033113: wsimport fails on WSDL:header parameter name customization
Reviewed-by: chegar
Diffstat (limited to 'src')
-rw-r--r-- | src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java | 3 | ||||
-rw-r--r-- | src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java index 5c51ae19..8591e845 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java @@ -177,7 +177,8 @@ public abstract class Message extends ModelObject { 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) { diff --git a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java index d13bf989..1aa0f5fb 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java @@ -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 @@ public class WSDLModeler extends WSDLModelerBase { } 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); |