Mercurial > hg > release > icedtea7-forest-2.5 > jaxws

changeset 1101:be838467cddd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Thu, 02 Oct 2014 08:31:37 -0700
parents 3aa92b3a7b85 (current diff) 587c4a3bfb76 (diff)
children 9325f780f8ba
files .hgtags
diffstat 3 files changed, 21 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Sep 11 11:03:08 2014 -0700
+++ b/.hgtags	Thu Oct 02 08:31:37 2014 -0700
@@ -506,3 +506,18 @@
 b37043cee55ed025b04a3420908897e69c6c687f jdk7u71-b11
 3a432d7f01ed998ee6ca2ed04e818849a3d1e0c7 jdk7u71-b12
 9dd0dea849dd2550b58346977d9111717c1f38b2 jdk7u71-b13
+a580f2c49eacc68a11cf0e724aec4a974fb77745 jdk7u71-b14
+18676fc7713f5341f298a1ae2aee9e217fcdb5a5 jdk7u72-b01
+e4bbb79df2b13cea8c24ee2e6346e1aa30645400 jdk7u72-b02
+646f7c237e9ecde8df0fc6524b3605a89e6dc135 jdk7u72-b03
+30d42f2fde558b4aeae26cc7bda89b2badf88aab jdk7u72-b04
+761c40c9076aefac72bbff913e8bc088e565386f jdk7u72-b05
+a3961ce4d5c1fd1f9cde546e62760a008b5b9d60 jdk7u72-b06
+1153553de579fbbf8c328ea47f07accf8e2d9ac2 jdk7u72-b07
+7b00d0359f49c82b38bb2f2faafae53eacc1a995 jdk7u72-b08
+f16ea19cfd03274e9e1fd5367c3f4c23accf4e75 jdk7u72-b09
+615c0d49e8927c9b03f5694df4ddb7a5e45eaf6d jdk7u72-b10
+b34f135642cddf3c15f1fecaad320cb12cbd9472 jdk7u72-b11
+cfa494e8b9bcd29ba59f1bfa3c365418b4102f71 jdk7u72-b12
+d4be88d9bfbff3e41bc4121838e90160734d9805 jdk7u72-b13
+e33bca6f8dab3e82b2dec2c52074f19a88e1267e jdk7u72-b14
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java	Thu Sep 11 11:03:08 2014 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java	Thu Oct 02 08:31:37 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	Thu Sep 11 11:03:08 2014 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java	Thu Oct 02 08:31:37 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);
             }