--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java Wed Apr 09 09:20:23 2014 -0700
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java Wed Apr 09 17:19:42 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
@@ -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/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java Wed Apr 09 09:20:23 2014 -0700
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java Wed Apr 09 17:19:42 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);