You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/11/02 04:03:30 UTC

svn commit: r591203 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java

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);