You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/02/16 11:06:02 UTC
svn commit: r378213 - in
/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix:
jbi/messaging/DeliveryChannelImpl.java jbi/nmr/flow/jms/JMSFlow.java
tck/MessageList.java
Author: gnodet
Date: Thu Feb 16 02:05:59 2006
New Revision: 378213
URL: http://svn.apache.org/viewcvs?rev=378213&view=rev
Log:
Do not use toDOMNode(ME) as the exchange is no more serializable
Modified:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlow.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/MessageList.java
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java?rev=378213&r1=378212&r2=378213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java Thu Feb 16 02:05:59 2006
@@ -280,7 +280,7 @@
sb.append(" id: ").append(me.getExchangeId()).append('\n');
sb.append(" status: ").append(me.getStatus()).append('\n');
if (me.getMessage("in") != null) {
- Node node = new SourceTransformer().toDOMNode(me.getMessage("in"));
+ Node node = new SourceTransformer().toDOMNode(me.getMessage("in").getContent());
me.getMessage("in").setContent(new DOMSource(node));
String str = DOMUtil.asXML(node);
sb.append(" in: ");
@@ -292,7 +292,7 @@
sb.append('\n');
}
if (me.getMessage("out") != null) {
- Node node = new SourceTransformer().toDOMNode(me.getMessage("out"));
+ Node node = new SourceTransformer().toDOMNode(me.getMessage("out").getContent());
me.getMessage("out").setContent(new DOMSource(node));
String str = DOMUtil.asXML(node);
sb.append(" out: ");
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlow.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlow.java?rev=378213&r1=378212&r2=378213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlow.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlow.java Thu Feb 16 02:05:59 2006
@@ -410,7 +410,7 @@
try {
JMSFlow.super.doRouting(me);
}
- catch (MessagingException e) {
+ catch (Throwable e) {
log.error("Caught an exception routing ExchangePacket: ", e);
}
}
Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/MessageList.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/MessageList.java?rev=378213&r1=378212&r2=378213&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/MessageList.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/MessageList.java Thu Feb 16 02:05:59 2006
@@ -83,13 +83,16 @@
}
}
-
public void waitForMessagesToArrive(int messageCount) {
+ waitForMessagesToArrive(messageCount, 4000);
+ }
+
+ public void waitForMessagesToArrive(int messageCount, long baseTimeout) {
log.info("Waiting for message to arrive");
long start = System.currentTimeMillis();
- while (System.currentTimeMillis() - start < 4000 + 100 * messageCount) {
+ while (System.currentTimeMillis() - start < baseTimeout + 100 * messageCount) {
try {
if (hasReceivedMessages(messageCount)) {
break;