Author: richard.opalka(a)jboss.com Date: 2007-11-08 04:19:01 -0500 (Thu, 08 Nov 2007) New Revision: 5008 Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMHelper.java Log: fixing hudson regression Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2007-11-08 09:07:06 UTC (rev 5007) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2007-11-08 09:19:01 UTC (rev 5008) @@ -194,7 +194,7 @@ try { - if (RMHelper.isRMMessage(reqMessage)) + if (RMHelper.isRMMessage(callProps)) { RMMetadata rmMetadata = new RMMetadata(targetAddress, oneway, marshaller, unmarshaller, callProps, metadata, clientConfig); return RM_CHANNEL.send(reqMessage, rmMetadata); Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java 2007-11-08 09:07:06 UTC (rev 5007) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMClientHandler.java 2007-11-08 09:19:01 UTC (rev 5008) @@ -117,16 +117,14 @@ List<Serializable> data = new LinkedList<Serializable>(); data.add(sequence); - if (commonMsgContext.getOperationMetaData().isOneWay() == false) - { - // TODO: ask msgStore if there are other sequences related to the same - // endpoint that requires ack and serialize it here - AckRequested ackRequested = rmFactory.newAckRequested(); - ackRequested.setIdentifier(sequenceImpl.getId()); - ackRequested.setMessageNumber(sequenceImpl.getLastMessageNumber()); - ackRequested.serializeTo(soapMessage); - data.add(ackRequested); - } + // TODO: ask msgStore if there are other sequences related to the same + // endpoint that requires ack and serialize it here + AckRequested ackRequested = rmFactory.newAckRequested(); + ackRequested.setIdentifier(sequenceImpl.getId()); + ackRequested.setMessageNumber(sequenceImpl.getLastMessageNumber()); + ackRequested.serializeTo(soapMessage); + data.add(ackRequested); + rmRequestContext.put(RMConstant.DATA, data); return true; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMHelper.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMHelper.java 2007-11-08 09:07:06 UTC (rev 5007) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/RMHelper.java 2007-11-08 09:19:01 UTC (rev 5008) @@ -1,6 +1,6 @@ package org.jboss.ws.extensions.wsrm; -import org.jboss.ws.core.MessageAbstraction; +import java.util.Map; public final class RMHelper { @@ -9,9 +9,8 @@ // no instances } - public static boolean isRMMessage(MessageAbstraction requestMessage) + public static boolean isRMMessage(Map<String, Object> ctx) { - // TODO: here is the most suitable place to start RM resender - return (new java.io.File("/home/ropalka/rm.enabled").exists()) && (requestMessage != null); + return (ctx != null) && (ctx.containsKey(RMConstant.DATA)); } }