You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/01/27 19:01:22 UTC
svn commit: r903770 - in /cxf/branches/2.2.x-fixes: ./
rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Author: dkulp
Date: Wed Jan 27 18:01:21 2010
New Revision: 903770
URL: http://svn.apache.org/viewvc?rev=903770&view=rev
Log:
Merged revisions 903763 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r903763 | dkulp | 2010-01-27 12:51:26 -0500 (Wed, 27 Jan 2010) | 1 line
Fix test failure.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=903770&r1=903769&r2=903770&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java (original)
+++ cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Wed Jan 27 18:01:21 2010
@@ -34,6 +34,7 @@
import org.apache.cxf.binding.soap.SoapBindingConstants;
import org.apache.cxf.binding.soap.model.SoapOperationInfo;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.endpoint.ConduitSelector;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.NullConduitSelector;
@@ -744,6 +745,7 @@
SoapOperationInfo soi =
bindingOpInfo.getExtensor(SoapOperationInfo.class);
action = soi == null ? null : soi.getAction();
+ action = StringUtils.isEmpty(action) ? null : action;
}
}
} else {