svn commit: r1132858 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java

[dkulp]

Author: dkulp
Date: Tue Jun  7 03:17:14 2011
New Revision: 1132858

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

........
  r1132857 | dkulp | 2011-06-06 23:10:45 -0400 (Mon, 06 Jun 2011) | 1 line
  
  [CXF-3560] Add NPE guard when WS-A is used with one-ways
........

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

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  7 03:17:14 2011
@@ -1 +1 @@
-/cxf/trunk:1128092,1128202-1128206,1130068,1130459-1130463
+/cxf/trunk:1128092,1128202-1128206,1130068,1130459-1130463,1132857

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

Modified: 
cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=1132858&r1=1132857&r2=1132858&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
 Tue Jun  7 03:17:14 2011
@@ -544,10 +544,12 @@ public class JaxWsServiceFactoryBean ext
                                                        inputAction);
             
operation.getInput().addExtensionAttribute(JAXWSAConstants.WSAW_ACTION_QNAME,
                                                        inputAction);
-            
operation.getOutput().addExtensionAttribute(JAXWSAConstants.WSAM_ACTION_QNAME,
-                                                       
computeAction(operation, "Response"));
-            
operation.getOutput().addExtensionAttribute(JAXWSAConstants.WSAW_ACTION_QNAME,
-                                                        
computeAction(operation, "Response"));
+            if (operation.getOutput() != null) {
+                
operation.getOutput().addExtensionAttribute(JAXWSAConstants.WSAM_ACTION_QNAME,
+                                                            
computeAction(operation, "Response"));
+                
operation.getOutput().addExtensionAttribute(JAXWSAConstants.WSAW_ACTION_QNAME,
+                                                            
computeAction(operation, "Response"));
+            }
 
         } else {
             MessageInfo input = operation.getInput();