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/06/11 20:47:17 UTC
svn commit: r953825 - in /cxf/branches/2.2.x-fixes: ./
rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
Author: dkulp
Date: Fri Jun 11 18:47:17 2010
New Revision: 953825
URL: http://svn.apache.org/viewvc?rev=953825&view=rev
Log:
Merged revisions 953334 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r953334 | ema | 2010-06-10 10:30:56 -0400 (Thu, 10 Jun 2010) | 1 line
[CXF-2842]:Fixed the wsa:action header missing when wsam:Action= in wsdl input;[CXF-2843]:Correct the wsa action value computation for response message
........
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
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.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=953825&r1=953824&r2=953825&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 Fri Jun 11 18:47:17 2010
@@ -806,7 +806,7 @@ public final class ContextUtils {
if (msgInfo != null
&& msgInfo.getExtensionAttributes() != null) {
String attr = getAction(msgInfo);
- if (attr != null) {
+ if (!StringUtils.isEmpty(attr)) {
action = attr;
msgInfo.setProperty(ACTION, action);
}
Modified: cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?rev=953825&r1=953824&r2=953825&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java (original)
+++ cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java Fri Jun 11 18:47:17 2010
@@ -524,7 +524,7 @@ public class MAPAggregator extends Abstr
if (inputMessage.getExtensionAttributes() != null) {
String inputAction = ContextUtils.getAction(inputMessage);
- if (inputAction != null) {
+ if (!StringUtils.isEmpty(inputAction)) {
return inputAction;
}
}
@@ -535,7 +535,7 @@ public class MAPAggregator extends Abstr
MessageInfo outputMessage = operation.getOutput();
if (outputMessage != null && outputMessage.getExtensionAttributes() != null) {
String outputAction = ContextUtils.getAction(outputMessage);
- if (outputAction != null) {
+ if (!StringUtils.isEmpty(outputAction)) {
return outputAction;
}
}
@@ -562,7 +562,7 @@ public class MAPAggregator extends Abstr
if (isSameFault(faultInfo, faultName)) {
if (faultInfo.getExtensionAttributes() != null) {
String faultAction = ContextUtils.getAction(faultInfo);
- if (faultAction != null) {
+ if (!StringUtils.isEmpty(faultAction)) {
return faultAction;
}
}
@@ -656,7 +656,7 @@ public class MAPAggregator extends Abstr
if (explicitAction != null) {
actionUri = explicitAction;
} else if (null == op.getOutputName()) {
- actionUri = addPath(opNamespace, op.getOutput().getName().getLocalPart());
+ actionUri = addPath(opNamespace, op.getName().getLocalPart() + "Response");
} else {
actionUri = addPath(opNamespace, op.getOutputName());
}