svn commit: r1340120 - in /cxf/branches/2.5.x-fixes: ./ rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXInInterceptor.java

[asoldano]

Author: asoldano
Date: Fri May 18 14:54:04 2012
New Revision: 1340120

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

........
  r1340102 | asoldano | 2012-05-18 16:22:44 +0200 (Fri, 18 May 2012) | 2 lines
  
  [CXF-4321] Prevent NPE
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    
cxf/branches/2.5.x-fixes/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXInInterceptor.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1340102

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

Modified: 
cxf/branches/2.5.x-fixes/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXInInterceptor.java?rev=1340120&r1=1340119&r2=1340120&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXInInterceptor.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXInInterceptor.java
 Fri May 18 14:54:04 2012
@@ -60,7 +60,7 @@ public class MEXInInterceptor extends Ab
         if (action == null) {
             AddressingProperties inProps = (AddressingProperties)message
                 
.getContextualProperty(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
-            if (inProps != null) {
+            if (inProps != null && inProps.getAction() != null) {
                 action = inProps.getAction().getValue();
             }
         }