Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 18781 invoked from network); 2 Nov 2007 03:03:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Nov 2007 03:03:52 -0000 Received: (qmail 19525 invoked by uid 500); 2 Nov 2007 03:03:39 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 19458 invoked by uid 500); 2 Nov 2007 03:03:39 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 19449 invoked by uid 99); 2 Nov 2007 03:03:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Nov 2007 20:03:39 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Nov 2007 03:03:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 97CDC1A9832; Thu, 1 Nov 2007 20:03:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r591203 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java Date: Fri, 02 Nov 2007 03:03:30 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071102030330.97CDC1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Nov 1 20:03:29 2007 New Revision: 591203 URL: http://svn.apache.org/viewvc?rev=591203&view=rev Log: Merged revisions 591076 via svnmerge from https://svn.apache.org/repos/asf/incubator/cxf/trunk ........ r591076 | dkulp | 2007-11-01 12:42:43 -0400 (Thu, 01 Nov 2007) | 2 lines [CXF-1123] Support some invalid WSDL's that are making faults types (like wsdls generated from Aegis in 2.0.2.) :-( ........ Modified: incubator/cxf/branches/2.0.x-fixes/ (props changed) incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java Propchange: incubator/cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java?rev=591203&r1=591202&r2=591203&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java (original) +++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java Thu Nov 1 20:03:29 2007 @@ -99,6 +99,21 @@ } } if (faultWanted == null) { + //did not find it using the proper qualified names, we'll try again with just the localpart + for (FaultInfo faultInfo : boi.getOperationInfo().getFaults()) { + for (MessagePartInfo mpi : faultInfo.getMessageParts()) { + if (qname.getLocalPart().equals(mpi.getConcreteName().getLocalPart())) { + faultWanted = faultInfo; + part = mpi; + break; + } + } + if (faultWanted != null) { + break; + } + } + } + if (faultWanted == null) { return; } Service s = msg.getExchange().get(Service.class);