Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 597C5DE97 for ; Tue, 13 Nov 2012 13:35:05 +0000 (UTC) Received: (qmail 57705 invoked by uid 500); 13 Nov 2012 13:35:05 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 57592 invoked by uid 500); 13 Nov 2012 13:35:05 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 57577 invoked by uid 99); 13 Nov 2012 13:35:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Nov 2012 13:35:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Nov 2012 13:35:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AD86423888E3; Tue, 13 Nov 2012 13:34:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1408716 - in /cxf/trunk: api/src/main/java/org/apache/cxf/endpoint/ api/src/main/java/org/apache/cxf/ws/addressing/ maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/ rt/bindings/soap/src/main/java/org/apache... Date: Tue, 13 Nov 2012 13:34:39 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121113133442.AD86423888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Tue Nov 13 13:34:36 2012 New Revision: 1408716 URL: http://svn.apache.org/viewvc?rev=1408716&view=rev Log: More cleanup Modified: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/UpfrontConduitSelector.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AsymmetricBinding.java cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SupportingToken.java cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SymmetricBinding.java cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TokenWrapper.java cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportBinding.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceVisitor.java cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java Modified: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/UpfrontConduitSelector.java URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/UpfrontConduitSelector.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/UpfrontConduitSelector.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/UpfrontConduitSelector.java Tue Nov 13 13:34:36 2012 @@ -60,7 +60,7 @@ public class UpfrontConduitSelector exte public void prepare(Message message) { Conduit c = message.get(Conduit.class); if (c == null) { - getSelectedConduit(message); + c = getSelectedConduit(message); message.put(Conduit.class, c); } } Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java Tue Nov 13 13:34:36 2012 @@ -442,7 +442,7 @@ public class VersionTransformer { if (o != null) { return convertToNative(o.getValue()); } - return convertToNative(o); + return convertToNative(null); } /** Modified: cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java (original) +++ cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java Tue Nov 13 13:34:36 2012 @@ -391,7 +391,7 @@ public class WSDL2JavaMojo extends Abstr for (Artifact a : pluginArtifacts) { File file = a.getFile(); if (file == null) { - throw new MojoExecutionException("Unable to find " + file + " for artifact " + throw new MojoExecutionException("Unable to find (null) file for artifact " + a.getGroupId() + ":" + a.getArtifactId() + ":" + a.getVersion()); } Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java (original) +++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java Tue Nov 13 13:34:36 2012 @@ -262,6 +262,7 @@ public class SAAJInInterceptor extends A if (p == null || p.getDataBinding() == null) { obj = elem; } else { + dataBinding = p.getDataBinding(); obj = p.getDataBinding().createReader(Node.class).read(elem); } //TODO - add the interceptors Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java (original) +++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Tue Nov 13 13:34:36 2012 @@ -863,7 +863,7 @@ public final class JAXBEncoderDecoder { while (enm.hasMoreElements()) { String s = (String)enm.nextElement(); if (s == null) { - nsMap.put("", c.getNamespaceURI(s)); + nsMap.put("", c.getNamespaceURI(null)); } else { nsMap.put(s, c.getNamespaceURI(s)); } Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java (original) +++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java Tue Nov 13 13:34:36 2012 @@ -180,13 +180,13 @@ public class DataWriterImpl extends J getAttachmentMarshaller()); } } - } else if (needToRender(obj, part)) { - JAXBEncoderDecoder.marshallNullElement(createMarshaller(obj, part), + } else if (needToRender(part)) { + JAXBEncoderDecoder.marshallNullElement(createMarshaller(null, part), output, part); } } - private boolean needToRender(Object obj, MessagePartInfo part) { + private boolean needToRender(MessagePartInfo part) { if (part != null && part.getXmlSchema() instanceof XmlSchemaElement) { XmlSchemaElement element = (XmlSchemaElement)part.getXmlSchema(); return element.isNillable() && element.getMinOccurs() > 0; Modified: cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java (original) +++ cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java Tue Nov 13 13:34:36 2012 @@ -194,7 +194,7 @@ public class DataWriterImpl implements D } else { StaxUtils.copy(reader, output, true); } - } else if (needToRender(obj, part)) { + } else if (needToRender(part)) { output.writeStartElement(part.getConcreteName().getNamespaceURI(), part.getConcreteName().getLocalPart()); output.writeEndElement(); @@ -204,7 +204,7 @@ public class DataWriterImpl implements D } } - private boolean needToRender(Object obj, MessagePartInfo part) { + private boolean needToRender(MessagePartInfo part) { if (part != null && part.getXmlSchema() instanceof XmlSchemaElement) { XmlSchemaElement element = (XmlSchemaElement)part.getXmlSchema(); return element.isNillable() && element.getMinOccurs() > 0; Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java Tue Nov 13 13:34:36 2012 @@ -199,9 +199,9 @@ public final class ResponseBuilderImpl e List varyValues = metadata.get(HttpHeaders.VARY); for (String v : values) { if (v == null) { - metadata.remove(v); + metadata.remove(null); if (varyValues != null) { - varyValues.remove(v); + varyValues.remove(null); } } else { addHeader(HttpHeaders.VARY, v); Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java Tue Nov 13 13:34:36 2012 @@ -162,7 +162,7 @@ public class JAXRSInInterceptor extends message.get(Message.REQUEST_URI), rawPath); LOG.warning(errorMsg.toString()); - Response resp = JAXRSUtils.createResponse(resource, message, errorMsg.toString(), + Response resp = JAXRSUtils.createResponse(null, message, errorMsg.toString(), Response.Status.NOT_FOUND.getStatusCode(), false); throw new NotFoundException(resp); } Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java Tue Nov 13 13:34:36 2012 @@ -898,7 +898,7 @@ public final class JAXRSUtils { } else if (Application.class.isAssignableFrom(clazz)) { ProviderInfo providerInfo = (ProviderInfo)contextMessage.getExchange().getEndpoint().get(Application.class.getName()); - o = providerInfo == null ? providerInfo : providerInfo.getProvider(); + o = providerInfo == null ? null : providerInfo.getProvider(); } if (o == null && contextMessage != null && !MessageUtils.isRequestor(contextMessage)) { o = createServletResourceValue(contextMessage, clazz); Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Tue Nov 13 13:34:36 2012 @@ -681,7 +681,7 @@ public class EndpointImpl extends javax. public Interceptor remove(int index) { Interceptor o = orig.remove(index); if (o == null) { - other.remove(o); + other.remove(null); } return o; } Modified: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java (original) +++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java Tue Nov 13 13:34:36 2012 @@ -805,7 +805,7 @@ public class MAPAggregatorImpl extends M if (maps.getTo() == null) { Conduit conduit = null; if (isOutbound) { - conduit = ContextUtils.getConduit(conduit, message); + conduit = ContextUtils.getConduit(null, message); } String s = (String)message.get(Message.ENDPOINT_ADDRESS); EndpointReferenceType reference = conduit != null Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java (original) +++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java Tue Nov 13 13:34:36 2012 @@ -217,7 +217,7 @@ public class PolicyEngineImpl implements if (null == effectivePolicy) { EffectivePolicyImpl epi = createOutPolicyInfo(); Assertor assertor = PolicyUtils.createAsserter(d); - epi.initialise(ei, boi, this, assertor, false, false, incoming); + epi.initialise(ei, boi, this, assertor, false, false, null); boi.setProperty(POLICY_INFO_RESPONSE_SERVER, epi); effectivePolicy = epi; } @@ -242,7 +242,7 @@ public class PolicyEngineImpl implements if (bfi == null) { EffectivePolicyImpl epi = createOutPolicyInfo(); Assertor assertor = PolicyUtils.createAsserter(d); - epi.initialise(ei, boi, bfi, this, assertor); + epi.initialise(ei, boi, null, this, assertor); return epi; } bfi = mapToWrappedBindingFaultInfo(bfi); Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AsymmetricBinding.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AsymmetricBinding.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AsymmetricBinding.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/AsymmetricBinding.java Tue Nov 13 13:34:36 2012 @@ -190,9 +190,7 @@ public class AsymmetricBinding extends S if (pc != null) { return pc; } else { - p = new Policy(); - p.addPolicyComponent(pc); - return p; + return new Policy(); } } Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SupportingToken.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SupportingToken.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SupportingToken.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SupportingToken.java Tue Nov 13 13:34:36 2012 @@ -331,9 +331,7 @@ public class SupportingToken extends Tok if (pc != null) { return pc; } else { - p = new Policy(); - p.addPolicyComponent(pc); - return p; + return new Policy(); } } Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SymmetricBinding.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SymmetricBinding.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SymmetricBinding.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SymmetricBinding.java Tue Nov 13 13:34:36 2012 @@ -140,9 +140,7 @@ public class SymmetricBinding extends Sy if (pc != null) { return pc; } else { - p = new Policy(); - p.addPolicyComponent(pc); - return p; + return new Policy(); } } Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TokenWrapper.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TokenWrapper.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TokenWrapper.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TokenWrapper.java Tue Nov 13 13:34:36 2012 @@ -65,9 +65,7 @@ public abstract class TokenWrapper exten if (pc != null) { return pc; } else { - p = new Policy(); - p.addPolicyComponent(pc); - return p; + return new Policy(); } } return null; Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportBinding.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportBinding.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportBinding.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportBinding.java Tue Nov 13 13:34:36 2012 @@ -147,9 +147,7 @@ public class TransportBinding extends Bi if (pc != null) { return pc; } else { - p = new Policy(); - p.addPolicyComponent(pc); - return p; + return new Policy(); } } } Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceVisitor.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceVisitor.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceVisitor.java (original) +++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/SequenceVisitor.java Tue Nov 13 13:34:36 2012 @@ -116,7 +116,7 @@ public class SequenceVisitor extends Vis schemaType = wsdlVisitor.getSequenceOctetType(); } } else { - schemaType = generateSchemaType(stype, scopedName, bound, fullyQualifiedName); + schemaType = generateSchemaType(null, scopedName, bound, fullyQualifiedName); } CorbaTypeImpl corbaType = null; Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java?rev=1408716&r1=1408715&r2=1408716&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java (original) +++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java Tue Nov 13 13:34:36 2012 @@ -90,7 +90,7 @@ public class ImplGenerator extends Abstr } else { for (String interfaceName : interfaces.keySet()) { JavaInterface intf = interfaces.get(interfaceName); - outputImpl(intf, service, "", penv); + outputImpl(intf, null, "", penv); } } }