cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1310455 - in /cxf/branches/2.4.x-fixes: ./ rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
Date Fri, 06 Apr 2012 16:35:07 GMT
Author: dkulp
Date: Fri Apr  6 16:35:06 2012
New Revision: 1310455

URL: http://svn.apache.org/viewvc?rev=1310455&view=rev
Log:
Merged revisions 1307440 via  svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1307440 | dkulp | 2012-03-30 10:26:04 -0400 (Fri, 30 Mar 2012) | 9 lines
  
  Merged revisions 1307130 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1307130 | dkulp | 2012-03-29 17:53:44 -0400 (Thu, 29 Mar 2012) | 2 lines
  
    Throw CXF specific SoapFault that the frontend can properly map.
  
  ........
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?rev=1310455&r1=1310454&r2=1310455&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
Fri Apr  6 16:35:06 2012
@@ -33,7 +33,6 @@ import java.util.logging.Logger;
 import javax.wsdl.extensions.ExtensibilityElement;
 import javax.xml.namespace.QName;
 import javax.xml.ws.WebFault;
-import javax.xml.ws.WebServiceException;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.binding.soap.SoapBindingConstants;
@@ -618,9 +617,9 @@ public class MAPAggregator extends Abstr
                     }
                 }
                 if (missingWsaHeader) {
-                    String reason = BUNDLE.getString("MISSING_ACTION_MESSAGE");
-                    throw new WebServiceException(reason + new QName(Names.WSA_NAMESPACE_NAME,
-                                                          Names.HEADER_REQUIRED_NAME));
+                    throw new SoapFault("MISSING_ACTION_MESSAGE", BUNDLE,
+                                        new QName(Names.WSA_NAMESPACE_NAME,
+                                                  Names.HEADER_REQUIRED_NAME));
                 }
             }
             if (MessageUtils.isPartialResponse(message) 



Mime
View raw message