Author: davsclaus
Date: Sun Nov 29 07:41:50 2009
New Revision: 885197
URL: http://svn.apache.org/viewvc?rev=885197&view=rev
Log:
CAMEL-2235: Polished tracer a bit and fixed CBR not setting parent on when and
otherwise
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java?rev=885197&r1=885196&r2=885197&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
Sun Nov 29 07:41:50 2009
@@ -84,7 +84,9 @@
* @return the builder
*/
public ChoiceDefinition when(Predicate predicate) {
- getWhenClauses().add(new WhenDefinition(predicate));
+ WhenDefinition when = new WhenDefinition(predicate);
+ when.setParent(this);
+ getWhenClauses().add(when);
return this;
}
@@ -95,6 +97,7 @@
*/
public ExpressionClause<ChoiceDefinition> when() {
WhenDefinition when = new WhenDefinition();
+ when.setParent(this);
getWhenClauses().add(when);
ExpressionClause<ChoiceDefinition> clause = new
ExpressionClause<ChoiceDefinition>(this);
when.setExpression(clause);
@@ -108,6 +111,7 @@
*/
public ChoiceDefinition otherwise() {
OtherwiseDefinition answer = new OtherwiseDefinition();
+ answer.setParent(this);
setOtherwise(answer);
return this;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java?rev=885197&r1=885196&r2=885197&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
Sun Nov 29 07:41:50 2009
@@ -44,7 +44,7 @@
// TODO: interceptSendToEndpoint needs to proxy the endpoints at very first
// so when other processors uses an endpoint its already proxied, see
workaround in SendProcessor
- // needed when we havent proxied beforehand. This requires some work in
the route builder in Camel
+ // needed when we haven't proxied beforehand. This requires some work in
the route builder in Camel
// to implement so that should be a part of a bigger rework/improvement in
the future
@XmlAttribute(required = true)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java?rev=885197&r1=885196&r2=885197&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
Sun Nov 29 07:41:50 2009
@@ -62,7 +62,7 @@
}
public String getTraceLabel() {
- return destination.getEndpointUri();
+ return "to(" + destination.getEndpointUri() + ")";
}
public void process(final Exchange exchange) throws Exception {
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java?rev=885197&r1=885196&r2=885197&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
Sun Nov 29 07:41:50 2009
@@ -22,7 +22,7 @@
/**
* The processor which implements the ThrowException DSL
*/
-public class ThrowExceptionProcessor implements Processor {
+public class ThrowExceptionProcessor implements Processor, Traceable {
private final Exception exception;
public ThrowExceptionProcessor(Exception exception) {
@@ -36,8 +36,11 @@
exchange.setException(exception);
}
+ public String getTraceLabel() {
+ return "throwException[" + exception.getClass().getSimpleName() + "]";
+ }
+
public String toString() {
return "ThrowException";
}
-
}
\ No newline at end of file
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java?rev=885197&r1=885196&r2=885197&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java
Sun Nov 29 07:41:50 2009
@@ -74,6 +74,11 @@
return "WireTap[" + destination.getEndpointUri() + "]";
}
+ @Override
+ public String getTraceLabel() {
+ return "wireTap(" + destination.getEndpointUri() + ")";
+ }
+
public void process(Exchange exchange) throws Exception {
getProducerCache(exchange).doInProducer(destination, exchange,
pattern, new ProducerCallback<Exchange>() {
public Exchange doInProducer(Producer producer, Exchange exchange,
ExchangePattern pattern) throws Exception {
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=885197&r1=885196&r2=885197&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
Sun Nov 29 07:41:50 2009
@@ -306,12 +306,14 @@
RouteNode traceTo = traced.getLastNode();
if (traceTo != null) {
to = getNodeMessage(traceTo, exchange);
- // if its an abstract dummy holder then get the 2nd last so we
can get the real node that has
+ // if its an abstract dummy holder then we have to get the 2nd
last so we can get the real node that has
// information which route it belongs to
- if (traceTo.isAbstract()) {
+ if (traceTo.isAbstract() && traceTo.getProcessorDefinition()
== null) {
traceTo = traced.getSecondLastNode();
}
- route = extractRoute(traceTo.getProcessorDefinition());
+ if (traceTo != null) {
+ route = extractRoute(traceTo.getProcessorDefinition());
+ }
}
}
