Author: ay Date: Thu Jun 20 16:40:39 2013 New Revision: 1495097 URL: http://svn.apache.org/r1495097 Log: Merged revisions 1495091 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1495091 | ay | 2013-06-20 18:37:28 +0200 (Thu, 20 Jun 2013) | 9 lines Merged revisions 1495088 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1495088 | ay | 2013-06-20 18:33:30 +0200 (Thu, 20 Jun 2013) | 1 line minor fix on ws-rm's handling of non ws-rm messages ........ ........ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java Propchange: cxf/branches/2.6.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java?rev=1495097&r1=1495096&r2=1495097&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java Thu Jun 20 16:40:39 2013 @@ -139,7 +139,6 @@ public final class RMContextUtils { ? RMMessageConstants.RM_PROPERTIES_OUTBOUND : RMMessageConstants.RM_PROPERTIES_INBOUND; } - //TODO put this key to the constant public static ProtocolVariation getProtocolVariation(Message message) { return (ProtocolVariation)message.get(RMMessageConstants.RM_PROTOCOL_VARIATION); } Modified: cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java?rev=1495097&r1=1495096&r2=1495097&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java Thu Jun 20 16:40:39 2013 @@ -48,7 +48,8 @@ public class RMInInterceptor extends Abs @Override public void handleFault(Message message) { message.put(MAPAggregator.class.getName(), true); - if (MessageUtils.isTrue(message.get(RMMessageConstants.DELIVERING_ROBUST_ONEWAY))) { + if (RMContextUtils.getProtocolVariation(message) != null + && MessageUtils.isTrue(message.get(RMMessageConstants.DELIVERING_ROBUST_ONEWAY))) { // revert the delivering entry from the destination sequence try { Destination destination = getManager().getDestination(message);
