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 2011/02/19 00:51:21 UTC
svn commit: r1072202 - in /cxf/branches/2.3.x-fixes: ./
rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Author: dkulp
Date: Fri Feb 18 23:51:21 2011
New Revision: 1072202
URL: http://svn.apache.org/viewvc?rev=1072202&view=rev
Log:
Merged revisions 1072196 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1072196 | dkulp | 2011-02-18 18:42:16 -0500 (Fri, 18 Feb 2011) | 2 lines
[CXF-3349] Fix possible NPE in WS-RM scenarios
Patch suggestion from Aki Yoshida applied
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 18 23:51:21 2011
@@ -1 +1 @@
-/cxf/trunk:1068320,1068337,1068525,1068867,1068877,1069130,1069138,1069249,1069318,1069492,1069500,1069716,1069720,1069814,1070034,1070430,1070471,1070558,1070778,1071743,1071946
+/cxf/trunk:1068320,1068337,1068525,1068867,1068877,1069130,1069138,1069249,1069318,1069492,1069500,1069716,1069720,1069814,1070034,1070430,1070471,1070558,1070778,1071743,1071946,1072196
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=1072202&r1=1072201&r2=1072202&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java (original)
+++ cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Fri Feb 18 23:51:21 2011
@@ -360,7 +360,7 @@ public final class ContextUtils {
* @param inMAPs the inbound MAPs
* @param inMessage the current message
*/
- public static void rebaseResponse(final EndpointReferenceType reference,
+ public static void rebaseResponse(EndpointReferenceType reference,
AddressingProperties inMAPs,
final Message inMessage) {
@@ -382,12 +382,13 @@ public final class ContextUtils {
}
try {
+ if (reference == null) {
+ reference = ContextUtils.getNoneEndpointReference();
+ }
exchange.setOutMessage(partialResponse);
Conduit backChannel = target.getBackChannel(inMessage,
partialResponse,
- reference == null
- ? ContextUtils.getNoneEndpointReference()
- : reference);
+ reference);
if (backChannel != null) {
// set up interceptor chains and send message
@@ -419,7 +420,8 @@ public final class ContextUtils {
exchange.setOutMessage(fullResponse);
Destination destination = createDecoupledDestination(
- exchange, reference);
+ exchange,
+ reference);
exchange.setDestination(destination);