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

changeset 1083:5fb558a02365

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Mon, 14 Jul 2014 13:34:51 -0700
parents c1780cb257ca (current diff) 7833c6d5d51b (diff)
children 2339fbceb401
files .hgtags
diffstat 3 files changed, 15 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jul 08 09:35:01 2014 -0700
+++ b/.hgtags	Mon Jul 14 13:34:51 2014 -0700
@@ -470,7 +470,11 @@
 df4dc644fe344e973fc1692c28683eec8ba82600 jdk7u65-b17
 0e0ca87a6d5212a0885f0c8c00b8f7cf24a64d89 jdk7u65-b30
 dedfc93eeb5f4b28ad1a91902a0676aef0937e42 jdk7u65-b18
+db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b19
+0cd66509e11335fac490076cbdcb2f47c592de86 jdk7u65-b32
+28d868d40df0d420b87698e1215e5039d24a8ae5 jdk7u65-b20
 190d885fe83b5b1801ee6d7327161254545d55a8 jdk7u65-b31
+6cf7676aa11c053481c0806afda9fc91c2bfd782 jdk7u65-b33
 d63ca1c5bdb9fb2e36ec4afda431c0d1dfdfc07c jdk7u66-b00
 1dce52b208a9528266c26352e03e67ec0ddb4dd7 jdk7u66-b01
 04481967eff566b8a379a0315d2a3a255928d6ce jdk7u66-b09
@@ -486,4 +490,9 @@
 814a3f0bb13071666375dd35bab7c9cc44c62448 jdk7u71-b01
 ba22fdc22c0410b91f6f992e480d9e8b4c5e85d0 jdk7u71-b02
 30edf4d8760f96b420bd40a2d9552826435356d4 jdk7u71-b03
+22cc8b125a119f9c23d0e81fc6627af330a27e4a jdk7u71-b04
+18676fc7713f5341f298a1ae2aee9e217fcdb5a5 jdk7u72-b01
+e4bbb79df2b13cea8c24ee2e6346e1aa30645400 jdk7u72-b02
+646f7c237e9ecde8df0fc6524b3605a89e6dc135 jdk7u72-b03
+30d42f2fde558b4aeae26cc7bda89b2badf88aab jdk7u72-b04
 664724762a245f1cd9d89ccd3d3833fcb16bed80 jdk7u75-b00
--- a/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java	Tue Jul 08 09:35:01 2014 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java	Mon Jul 14 13:34:51 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	Tue Jul 08 09:35:01 2014 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java	Mon Jul 14 13:34:51 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);
             }