8033113: wsimport fails on WSDL:header parameter name customization

Reviewed-by: chegar
This commit is contained in:
Miroslav Kos 2014-04-08 11:26:40 +01:00
parent e50cc941f9
commit 805cbfba88
2 changed files with 6 additions and 5 deletions
jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor

@ -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
@ -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) {

@ -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);