svn commit: r648790 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ rt/core/src/main/java/org/apache/cxf/service/invoker/ systests/src/test/java/org/apache/cxf/systest/coloc/

[dkulp]

Author: dkulp
Date: Wed Apr 16 11:39:07 2008
New Revision: 648790

URL: http://svn.apache.org/viewvc?rev=648790&view=rev
Log:
Merged revisions 648774 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r648774 | dkulp | 2008-04-16 14:10:24 -0400 (Wed, 16 Apr 2008) | 2 lines
  
  [CXF-1534] If the service throws a CXF Fault, just pass that up unwrapped to 
not lose anything.
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    
incubator/cxf/branches/2.0.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/WebFaultInInterceptor.java
    
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
    
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/coloc/AbstractHeaderServiceRpcLitTest.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/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/WebFaultInInterceptor.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/WebFaultInInterceptor.java?rev=648790&r1=648789&r2=648790&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/WebFaultInInterceptor.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/WebFaultInInterceptor.java
 Wed Apr 16 11:39:07 2008
@@ -47,7 +47,11 @@
             Fault f = (Fault) ex;
             ex = (Exception) f.getCause();
         }
-        
+        if (ex == null) { 
+            return;
+        }
+
+
         QName faultName = this.getFaultName(ex);
         if (faultName == null) {
             return;

Modified: 
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java?rev=648790&r1=648789&r2=648790&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
 Wed Apr 16 11:39:07 2008
@@ -92,6 +92,9 @@
                 t = e;
             }
             exchange.getInMessage().put(FaultMode.class, 
FaultMode.CHECKED_APPLICATION_FAULT);
+            if (t instanceof Fault) {
+                throw (Fault)t;
+            }
             throw createFault(t, m, params, true);
         } catch (Fault f) {
             exchange.getInMessage().put(FaultMode.class, 
FaultMode.UNCHECKED_APPLICATION_FAULT);

Modified: 
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/coloc/AbstractHeaderServiceRpcLitTest.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/coloc/AbstractHeaderServiceRpcLitTest.java?rev=648790&r1=648789&r2=648790&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/coloc/AbstractHeaderServiceRpcLitTest.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/coloc/AbstractHeaderServiceRpcLitTest.java
 Wed Apr 16 11:39:07 2008
@@ -211,7 +211,8 @@
             ht.pingMe(in);
             fail("Should throw a CXF Fault exception");
         } catch (WebServiceException fault) {
-            assertFalse(-1 == 
fault.getMessage().lastIndexOf(HeaderTesterUtil.EX_STRING));
+            assertFalse("Wrong message: " + fault.getMessage(),
+                        -1 == 
fault.getMessage().lastIndexOf(HeaderTesterUtil.EX_STRING));
             if (isFaultCodeCheckEnabled()) {
                 verifyFaultCode(port);
             }