Mercurial > hg > icedtea7-forest-aarch64 > jaxws
changeset 1061:6f48d3fb52cd
Merge
author | coffeys |
---|---|
date | Mon, 28 Jul 2014 03:52:57 -0700 |
parents | 0540f17603fb (diff) 26ad03c06f31 (current diff) |
children | 1153553de579 |
files | .hgtags |
diffstat | 3 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jul 28 03:32:32 2014 -0700 +++ b/.hgtags Mon Jul 28 03:52:57 2014 -0700 @@ -494,3 +494,9 @@ 22cc8b125a119f9c23d0e81fc6627af330a27e4a jdk7u71-b04 f612dbc0589894463f569fba245a98f842182d7a jdk7u71-b05 15bdfc8b209a7c5b4e06907df11d3f795d326c14 jdk7u71-b06 +18676fc7713f5341f298a1ae2aee9e217fcdb5a5 jdk7u72-b01 +e4bbb79df2b13cea8c24ee2e6346e1aa30645400 jdk7u72-b02 +646f7c237e9ecde8df0fc6524b3605a89e6dc135 jdk7u72-b03 +30d42f2fde558b4aeae26cc7bda89b2badf88aab jdk7u72-b04 +761c40c9076aefac72bbff913e8bc088e565386f jdk7u72-b05 +a3961ce4d5c1fd1f9cde546e62760a008b5b9d60 jdk7u72-b06
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java Mon Jul 28 03:32:32 2014 -0700 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java Mon Jul 28 03:52:57 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, 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 @@ -25,7 +25,6 @@ package com.sun.tools.internal.ws.processor.model; -import com.sun.tools.internal.ws.wsdl.framework.Entity; import com.sun.tools.internal.ws.wscompile.ErrorReceiver; import com.sun.tools.internal.ws.wscompile.AbortException; import com.sun.tools.internal.ws.resources.ModelMessages; @@ -177,7 +176,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/WSDLModeler.java Mon Jul 28 03:32:32 2014 -0700 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java Mon Jul 28 03:52:57 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, 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 @@ -1757,9 +1757,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); }