cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1380132 - /cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Date Mon, 03 Sep 2012 06:14:15 GMT
Author: ffang
Date: Mon Sep  3 06:14:14 2012
New Revision: 1380132

URL: http://svn.apache.org/viewvc?rev=1380132&view=rev
Log:
[CXF-4493]add NPE guard when FaultAction is used with OneWay

Modified:
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=1380132&r1=1380131&r2=1380132&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Mon Sep  3 06:14:14 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