cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1380136 - in /cxf/branches/2.4.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Date Mon, 03 Sep 2012 06:45:04 GMT
Author: ffang
Date: Mon Sep  3 06:45:03 2012
New Revision: 1380136

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

........
  r1380134 | ffang | 2012-09-03 14:35:03 +0800 (δΈ€, 03  9 2012) | 1 line
  
  [CXF-4493]add NPE guard when FaultAction is used with OneWay
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.5.x-fixes:r1380134

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

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=1380136&r1=1380135&r2=1380136&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Mon Sep  3 06:45:03 2012
@@ -579,7 +579,7 @@ public class JaxWsServiceFactoryBean ext
             if (faultActions != null && faultActions.length > 0 && operation.getFaults()
!= null) {
                 for (FaultAction faultAction : faultActions) {
                     FaultInfo faultInfo = getFaultInfo(operation, faultAction.className());
-                    if (!StringUtils.isEmpty(faultAction.value())) {
+                    if (faultInfo != null && !StringUtils.isEmpty(faultAction.value()))
{
                         faultInfo.addExtensionAttribute(JAXWSAConstants.WSAW_ACTION_QNAME,
faultAction
                             .value());
                         faultInfo.addExtensionAttribute(JAXWSAConstants.WSAM_ACTION_QNAME,
faultAction
@@ -587,7 +587,7 @@ public class JaxWsServiceFactoryBean ext
                     }
                     if (operation.isUnwrappedCapable()) {
                         faultInfo = getFaultInfo(operation.getUnwrappedOperation(), faultAction.className());
-                        if (!StringUtils.isEmpty(faultAction.value())) {
+                        if (faultInfo != null && !StringUtils.isEmpty(faultAction.value()))
{
                             faultInfo.addExtensionAttribute(JAXWSAConstants.WSAW_ACTION_QNAME,
faultAction
                                 .value());
                             faultInfo.addExtensionAttribute(JAXWSAConstants.WSAM_ACTION_QNAME,
faultAction



Mime
View raw message