xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2854 Fix merge issue in MessageProducer between DRs 2726 and 3684

Browse source 
Change-Id: I6a6ea9c57857459f61e955a54275a8983a8004ce

Former-commit-id: 755fdd1950 [formerly a60e3465f4] [formerly 654c831b4e [formerly 09f13d9b33cfe3547d2dc3fb75c1673e1f3193b0]]
Former-commit-id: 654c831b4e
Former-commit-id: 47be7dc5a8
This commit is contained in:
Ron Anderson 2014-11-12 11:25:32 -06:00
parent d58e10f006
commit dac3e5320a
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
View file

@ -41,10 +41,10 @@ import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.InterceptStrategy;
import com.raytheon.uf.common.message.IMessage;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.serialization.SerializationException;
import com.raytheon.uf.common.serialization.SerializationUtil;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.util.Pair;
import com.raytheon.uf.common.util.collections.BoundedMap;
import com.raytheon.uf.edex.core.EDEXUtil;
@ -179,7 +179,8 @@ public class MessageProducer implements IMessageProducer, InterceptStrategy {
@Override
public void sendAsyncThriftUri(String uri, Object message)
throws EdexException, SerializationException {
if (!started && queueWaitingMessage(WaitingType.URI, uri, message)) {
if (!started
&& queueWaitingMessage(WaitingType.THRIFT_URI, uri, message)) {
return;
}
@ -193,7 +194,7 @@ public class MessageProducer implements IMessageProducer, InterceptStrategy {
template.sendBodyAndHeaders(ep, ExchangePattern.InOnly,
SerializationUtil.transformToThrift(message), headers);
} else {
template.sendBody(ep, ExchangePattern.InOnly,
template.sendBody(ep, ExchangePattern.InOnly,
SerializationUtil.transformToThrift(message));
}
} catch (Exception e) {
@ -379,6 +380,9 @@ public class MessageProducer implements IMessageProducer, InterceptStrategy {
case URI:
sendAsyncUri(wm.dest, wm.msg);
break;
case THRIFT_URI:
sendAsyncThriftUri(wm.dest, wm.msg);
break;
}
} catch (Exception e) {
statusHandler
@ -448,7 +452,7 @@ public class MessageProducer implements IMessageProducer, InterceptStrategy {
* Enum for handling whether the waiting type was uri or msg.
*/
private enum WaitingType {
ID, URI
ID, URI, THRIFT_URI
};
/**