You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2012/10/25 14:26:02 UTC
svn commit: r1402128 - in
/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm:
RMInInterceptor.java RMMessageConstants.java
Author: ay
Date: Thu Oct 25 12:26:01 2012
New Revision: 1402128
URL: http://svn.apache.org/viewvc?rev=1402128&view=rev
Log:
fix svn merge error for r1402114
Modified:
cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMMessageConstants.java
Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java?rev=1402128&r1=1402127&r2=1402128&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java Thu Oct 25 12:26:01 2012
@@ -47,7 +47,7 @@ public class RMInInterceptor extends Abs
@Override
public void handleFault(Message message) {
message.put(MAPAggregator.class.getName(), true);
- if (null == RMContextUtils.getProtocolVariation(message)) {
+ if (null == message.get(RMMessageConstants.RM_PROTOCOL_VARIATION)) {
return;
}
if (MessageUtils.isTrue(message.get(RMMessageConstants.DELIVERING_ROBUST_ONEWAY))) {
@@ -109,6 +109,7 @@ public class RMInInterceptor extends Abs
LOG.log(Level.INFO, msg.toString());
throw new RMException(msg);
}
+ message.put(RMMessageConstants.RM_PROTOCOL_VARIATION, protocol);
// Destination destination = getManager().getDestination(message);
// RMEndpoint rme = getManager().getReliableEndpoint(message);
Modified: cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMMessageConstants.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMMessageConstants.java?rev=1402128&r1=1402127&r2=1402128&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMMessageConstants.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMMessageConstants.java Thu Oct 25 12:26:01 2012
@@ -42,6 +42,9 @@ public final class RMMessageConstants {
public static final String SAVED_CONTENT =
"org.apache.cxf.ws.rm.content";
+ static final String RM_PROTOCOL_VARIATION =
+ "org.apache.cxf.ws.rm.protocol";
+
// keep this constant in the ws-rm package until it finds a general use outside of ws-rm
static final String DELIVERING_ROBUST_ONEWAY =
"org.apache.cxf.oneway.robust.delivering";