Author: jason.greene(a)jboss.com Date: 2007-02-21 21:51:17 -0500 (Wed, 21 Feb 2007) New Revision: 2437 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java Log: Fix doc/wrapped non header INOUTS Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-02-21 23:55:38 UTC (rev 2436) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-02-22 02:51:17 UTC (rev 2437) @@ -651,7 +651,13 @@ if (! "OUT".equals(parameterMode)) wrappedParameters.add(wrapped); if (! "IN".equals(parameterMode)) + { + wrapped.setHolder(true); + // wrapped parameters can not be shared between request/response objects (accessors) + if ("INOUT".equals(parameterMode)) + wrapped = new WrappedParameter(wrapped); wrappedResponseParameters.add(wrapped); + } } inMetaData.setWrappedParameters(wrappedParameters); wsdlPosition = wrappedParameters.size(); Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-02-21 23:55:38 UTC (rev 2436) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-02-22 02:51:17 UTC (rev 2437) @@ -624,10 +624,15 @@ if (mode != ParameterMode.OUT) wrappedParameters.add(wrappedParameter); + if (mode != ParameterMode.IN) { + wrappedParameter.setHolder(true); + + // WrappedParameters can not be shared between request/response objects (accessors) + if (mode == ParameterMode.INOUT) + wrappedParameter = new WrappedParameter(wrappedParameter); wrappedOutputParameters.add(wrappedParameter); - wrappedParameter.setHolder(true); } } else Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2007-02-21 23:55:38 UTC (rev 2436) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2007-02-22 02:51:17 UTC (rev 2437) @@ -42,6 +42,17 @@ private int index = -2; private Accessor accessor; + public WrappedParameter(WrappedParameter wrapped) + { + this.name = wrapped.name; + this.type = wrapped.type; + this.typeArguments = wrapped.typeArguments; + this.variable = wrapped.variable; + this.holder = wrapped.holder; + this.index = wrapped.index; + this.accessor = wrapped.accessor; + } + public WrappedParameter(QName name, String type, String variable, int index) { this.setName(name);