You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/06/26 19:02:29 UTC
svn commit: r788766 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/main/java/org/apache/camel/processor/ camel-core/src/main/...
Author: davsclaus
Date: Fri Jun 26 17:02:29 2009
New Revision: 788766
URL: http://svn.apache.org/viewvc?rev=788766&view=rev
Log:
CAMEL-1759: Tracing onCompletion and onException needs special care. The code in TraceInterceptor need a bit more cleanup.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/RouteNode.java (contents, props changed)
- copied, changed from r788663, camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteNode.java
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteNode.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessage.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TraceableUnitOfWork.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java?rev=788766&r1=788765&r2=788766&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java Fri Jun 26 17:02:29 2009
@@ -48,6 +48,7 @@
String CHARSET_NAME = "CamelCharsetName";
String CONTENT_TYPE = "CamelContentType";
+ String CORRELATION_ID = "CamelCorrelationId";
String DATASET_INDEX = "CamelDataSetIndex";
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/RouteNode.java (from r788663, camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteNode.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/RouteNode.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/RouteNode.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteNode.java&r1=788663&r2=788766&rev=788766&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteNode.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/RouteNode.java Fri Jun 26 17:02:29 2009
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.model;
+package org.apache.camel;
-import org.apache.camel.Processor;
+import org.apache.camel.model.ProcessorDefinition;
/**
* Represents a model of a node in the runtime route path.
@@ -38,4 +38,23 @@
* @return the definition, is newer <tt>null</tt>
*/
ProcessorDefinition getProcessorDefinition();
+
+ /**
+ * Gets a label about this node to be used for tracing or tooling etc.
+ *
+ * @param exchange the current exchange
+ * @return a label for this node
+ */
+ String getLabel(Exchange exchange);
+
+ /**
+ * Whether this node is abstract (no real processor under the cover).
+ * <p/>
+ * Some nodes is abstract that represents intermediate steps for instance with
+ * onException, onCompletion or intercept
+ *
+ * @return whether this node is abstract or not
+ */
+ boolean isAbstract();
+
}
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/RouteNode.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/RouteNode.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java?rev=788766&r1=788765&r2=788766&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java Fri Jun 26 17:02:29 2009
@@ -97,6 +97,8 @@
if (handoverOnCompletion && unitOfWork != null) {
unitOfWork.handoverSynchronization(copy);
}
+ // set a correlation id so we can track back the original exchange
+ copy.setProperty(Exchange.CORRELATION_ID, this.getExchangeId());
return copy;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java?rev=788766&r1=788765&r2=788766&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java Fri Jun 26 17:02:29 2009
@@ -16,25 +16,34 @@
*/
package org.apache.camel.impl;
+import org.apache.camel.Exchange;
+import org.apache.camel.Expression;
import org.apache.camel.Processor;
+import org.apache.camel.RouteNode;
import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.model.RouteNode;
+import org.apache.camel.processor.Traceable;
/**
- * A default implementation of the {@link org.apache.camel.model.RouteNode}
+ * A default implementation of the {@link org.apache.camel.RouteNode}
*
* @version $Revision$
*/
public class DefaultRouteNode implements RouteNode {
+ private Expression expression;
private Processor processor;
private ProcessorDefinition processorDefinition;
- public DefaultRouteNode(Processor processor, ProcessorDefinition processorDefinition) {
+ public DefaultRouteNode(ProcessorDefinition processorDefinition, Processor processor) {
this.processor = processor;
this.processorDefinition = processorDefinition;
}
+ public DefaultRouteNode(ProcessorDefinition processorDefinition, Expression expression) {
+ this.processorDefinition = processorDefinition;
+ this.expression = expression;
+ }
+
public Processor getProcessor() {
return processor;
}
@@ -43,6 +52,27 @@
return processorDefinition;
}
+ public String getLabel(Exchange exchange) {
+ if (expression != null) {
+ return expression.evaluate(exchange, String.class);
+ }
+
+ if (processor != null) {
+ if (processor instanceof Traceable) {
+ Traceable trace = (Traceable) processor;
+ return trace.getTraceLabel();
+ }
+ processor.toString();
+ }
+
+ // default then to definition
+ return processorDefinition.getLabel();
+ }
+
+ public boolean isAbstract() {
+ return processor == null;
+ }
+
@Override
public String toString() {
return "RouteNode[" + processorDefinition + "]";
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java?rev=788766&r1=788765&r2=788766&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java Fri Jun 26 17:02:29 2009
@@ -24,9 +24,9 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.Exchange;
+import org.apache.camel.RouteNode;
import org.apache.camel.Service;
-import org.apache.camel.model.InterceptDefinition;
-import org.apache.camel.model.RouteNode;
+import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.spi.TraceableUnitOfWork;
import org.apache.camel.util.UuidGenerator;
@@ -45,7 +45,7 @@
private String id;
private List<Synchronization> synchronizations;
private List<RouteNode> routeNodes;
- private Map<InterceptDefinition, AtomicInteger> interceptIndex = new HashMap<InterceptDefinition, AtomicInteger>();
+ private Map<ProcessorDefinition, AtomicInteger> routeIndex = new HashMap<ProcessorDefinition, AtomicInteger>();
private Object originalInBody;
public DefaultUnitOfWork(Exchange exchange) {
@@ -64,7 +64,7 @@
if (routeNodes != null) {
routeNodes.clear();
}
- interceptIndex.clear();
+ routeIndex.clear();
originalInBody = null;
}
@@ -148,11 +148,11 @@
return originalInBody;
}
- public int getAndIncrement(InterceptDefinition node) {
- AtomicInteger count = interceptIndex.get(node);
+ public int getAndIncrement(ProcessorDefinition node) {
+ AtomicInteger count = routeIndex.get(node);
if (count == null) {
count = new AtomicInteger();
- interceptIndex.put(node, count);
+ routeIndex.put(node, count);
}
return count.getAndIncrement();
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java?rev=788766&r1=788765&r2=788766&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java Fri Jun 26 17:02:29 2009
@@ -30,6 +30,7 @@
import org.apache.camel.Processor;
import org.apache.camel.builder.ExpressionClause;
import org.apache.camel.processor.OnCompletionProcessor;
+import org.apache.camel.processor.UnitOfWorkProcessor;
import org.apache.camel.spi.RouteContext;
/**
@@ -72,6 +73,9 @@
public Processor createProcessor(RouteContext routeContext) throws Exception {
Processor childProcessor = createOutputsProcessor(routeContext);
+ // wrap the on completion route in a unit of work processor
+ childProcessor = new UnitOfWorkProcessor(childProcessor);
+
Predicate when = null;
if (onWhen != null) {
when = onWhen.getExpression().createPredicate(routeContext);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java?rev=788766&r1=788765&r2=788766&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java Fri Jun 26 17:02:29 2009
@@ -33,7 +33,7 @@
/**
* @version $Revision$
*/
-public class OnCompletionProcessor extends ServiceSupport implements Processor {
+public class OnCompletionProcessor extends ServiceSupport implements Processor, Traceable {
private static final transient Log LOG = LogFactory.getLog(OnCompletionProcessor.class);
private ExecutorService executorService;
@@ -169,4 +169,8 @@
public String toString() {
return "OnCompletionProcessor[" + processor + "]";
}
+
+ public String getTraceLabel() {
+ return "OnCompletion";
+ }
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessage.java?rev=788766&r1=788765&r2=788766&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessage.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventMessage.java Fri Jun 26 17:02:29 2009
@@ -23,7 +23,7 @@
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.model.RouteNode;
+import org.apache.camel.RouteNode;
import org.apache.camel.processor.Traceable;
import org.apache.camel.spi.TraceableUnitOfWork;
import org.apache.camel.util.MessageHelper;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java?rev=788766&r1=788765&r2=788766&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java Fri Jun 26 17:02:29 2009
@@ -19,8 +19,8 @@
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
+import org.apache.camel.RouteNode;
import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.model.RouteNode;
import org.apache.camel.processor.Traceable;
import org.apache.camel.spi.TraceableUnitOfWork;
import org.apache.camel.spi.UnitOfWork;
@@ -229,29 +229,11 @@
// Implementation methods
//-------------------------------------------------------------------------
protected Object getBreadCrumbID(Exchange exchange) {
- UnitOfWork unitOfWork = exchange.getUnitOfWork();
- if (unitOfWork != null) {
- return unitOfWork.getId();
- } else {
- return exchange.getExchangeId();
- }
+ return exchange.getExchangeId();
}
- protected String getNodeMessage(RouteNode entry) {
- Processor processor = entry.getProcessor();
-
- if (processor == null) {
- return "";
- }
-
- String message;
- if (processor instanceof Traceable) {
- Traceable trace = (Traceable) processor;
- message = trace.getTraceLabel();
- } else {
- message = processor.toString();
- }
-
+ protected String getNodeMessage(RouteNode entry, Exchange exchange) {
+ String message = entry.getLabel(exchange);
if (nodeLength > 0) {
return String.format("%1$-" + nodeLength + "." + nodeLength + "s", message);
} else {
@@ -293,14 +275,14 @@
RouteNode traceFrom = tuow.getSecondLastNode();
if (traceFrom != null) {
- from = getNodeMessage(traceFrom);
+ from = getNodeMessage(traceFrom, exchange);
} else if (exchange.getFromEndpoint() != null) {
from = "from(" + exchange.getFromEndpoint().getEndpointUri() + ")";
}
RouteNode traceTo = tuow.getLastNode();
if (traceTo != null) {
- to = getNodeMessage(traceTo);
+ to = getNodeMessage(traceTo, exchange);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java?rev=788766&r1=788765&r2=788766&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java Fri Jun 26 17:02:29 2009
@@ -22,10 +22,12 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
+import org.apache.camel.Expression;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultRouteNode;
import org.apache.camel.model.InterceptDefinition;
+import org.apache.camel.model.OnCompletionDefinition;
import org.apache.camel.model.OnExceptionDefinition;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.processor.DelegateProcessor;
@@ -104,37 +106,74 @@
// before
if (shouldLog) {
+ // TODO: refactor into smaller methods
+ // TODO: add code comments about why we do this
+
+ boolean trace = true;
+
// if traceable then register this as the previous node, now it has been logged
if (exchange.getUnitOfWork() instanceof TraceableUnitOfWork) {
+
TraceableUnitOfWork tuow = (TraceableUnitOfWork) exchange.getUnitOfWork();
// special for on exception so we can see it in the trace logs
if (node instanceof OnExceptionDefinition) {
- Processor pseudo = new Processor() {
- public void process(Exchange exchange) throws Exception {
- }
+ // lets see if this is the first time for this exception
+ int index = tuow.getAndIncrement(node);
+ if (index == 0) {
+ Expression exp = new Expression() {
+ public <T> T evaluate(Exchange exchange, Class<T> type) {
+ String label = "OnException";
+ if (exchange.getProperty(Exchange.EXCEPTION_CAUGHT) != null) {
+ label += "[" + exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class).getClass().getSimpleName() + "]";
+ }
+ return exchange.getContext().getTypeConverter().convertTo(type, label);
+ }
+ };
+ // yes its first time then do some special to log and trace the start of onException
+ tuow.addTraced(new DefaultRouteNode(node, exp));
- public String toString() {
- String name = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class).getClass().getSimpleName();
- return "onException[" + name + "]";
- }
- };
- tuow.addTraced(new DefaultRouteNode(pseudo, node));
+ // log and trace the processor that was onException so we can see it
+ logExchange(exchange);
+ traceExchange(exchange);
+ }
- // log and trace the processor that was onException so we can see it
- logExchange(exchange);
- traceExchange(exchange);
- }
+ tuow.addTraced(new DefaultRouteNode(node, super.getProcessor()));
- // register the processor that was traced
- tuow.addTraced(new DefaultRouteNode(super.getProcessor(), node));
+ } else if (node instanceof OnCompletionDefinition) {
+ trace = tuow.getLastNode() != null;
+
+ if (exchange.getProperty(Exchange.ON_COMPLETION) != null) {
+ // we should trace the onCompletion route
+ int index = tuow.getAndIncrement(node);
+ if (index == 0) {
+ // yes its first time then do some special to log and trace the start of onCompletion
+ Expression exp = new Expression() {
+ public <T> T evaluate(Exchange exchange, Class<T> type) {
+ String label = "OnCompletion[" + exchange.getProperty(Exchange.CORRELATION_ID) + "]";
+ return exchange.getContext().getTypeConverter().convertTo(type, label);
+ }
+ };
+ tuow.addTraced(new DefaultRouteNode(node, exp));
+ tuow.addTraced(new DefaultRouteNode(node, super.getProcessor()));
+
+ // log and trace the processor that was onCompletion so we can see it
+ logExchange(exchange);
+ traceExchange(exchange);
+ } else {
+ tuow.addTraced(new DefaultRouteNode(node, super.getProcessor()));
+ }
+ }
+ } else {
+ tuow.addTraced(new DefaultRouteNode(node, super.getProcessor()));
+ }
}
- // TODO: just a little more to avoid logging the last intercepted step
-
// log and trace the processor
- logExchange(exchange);
- traceExchange(exchange);
+ if (trace) {
+ logExchange(exchange);
+ traceExchange(exchange);
+ }
// some nodes need extra work to trace it
if (exchange.getUnitOfWork() instanceof TraceableUnitOfWork) {
@@ -152,7 +191,7 @@
InterceptDefinition intercept = (InterceptDefinition) node;
Processor last = intercept.getInterceptedProcessor(tuow.getAndIncrement(intercept));
if (last != null) {
- tuow.addTraced(new DefaultRouteNode(last, node));
+ tuow.addTraced(new DefaultRouteNode(node, last));
// log and trace the processor that was intercepted so we can see it
logExchange(exchange);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TraceableUnitOfWork.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TraceableUnitOfWork.java?rev=788766&r1=788765&r2=788766&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TraceableUnitOfWork.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TraceableUnitOfWork.java Fri Jun 26 17:02:29 2009
@@ -18,8 +18,8 @@
import java.util.List;
-import org.apache.camel.model.InterceptDefinition;
-import org.apache.camel.model.RouteNode;
+import org.apache.camel.RouteNode;
+import org.apache.camel.model.ProcessorDefinition;
/**
* A Unit of work that is also traceable with the
@@ -63,6 +63,6 @@
* @param node the intercept node
* @return the current count
*/
- int getAndIncrement(InterceptDefinition node);
+ int getAndIncrement(ProcessorDefinition node);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTest.java?rev=788766&r1=788765&r2=788766&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTest.java Fri Jun 26 17:02:29 2009
@@ -62,6 +62,8 @@
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ context.setTracing(true);
+
// START SNIPPET: e1
// define a global on completion that is invoked when the exchage is complete
onCompletion().to("log:global").to("mock:sync");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java?rev=788766&r1=788765&r2=788766&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java Fri Jun 26 17:02:29 2009
@@ -23,7 +23,7 @@
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.model.RouteNode;
+import org.apache.camel.RouteNode;
import org.apache.camel.spi.TraceableUnitOfWork;
/**
Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java?rev=788766&r1=788765&r2=788766&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java (original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java Fri Jun 26 17:02:29 2009
@@ -84,7 +84,7 @@
JpaTraceEventMessage db = (JpaTraceEventMessage) list.get(0);
assertNotNull(db.getId());
assertEquals("direct:start", db.getFromEndpointUri());
- assertEquals("to(mock:result)", db.getToNode());
+ assertEquals("mock:result", db.getToNode());
}
protected void cleanupRepository() {