Updated Branches: refs/heads/master 8c5d71b3e -> 9abffe3c3
CAMEL-6377: Optimized routing engine to reduce stack frames in use during routing. Work in progress. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/94780867 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/94780867 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/94780867 Branch: refs/heads/master Commit: 94780867cfb3f736f233d6e594fc53a5274c701a Parents: 8c5d71b Author: Claus Ibsen <davscl...@apache.org> Authored: Sun May 26 19:05:06 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun May 26 19:05:06 2013 +0200 ---------------------------------------------------------------------- .../camel/processor/DelayProcessorSupport.java | 2 +- .../apache/camel/processor/interceptor/Debug.java | 2 +- .../processor/interceptor/TraceInterceptor.java | 4 ++-- .../AsyncEndpointCustomAsyncInterceptorTest.java | 4 ++-- .../AuditInterceptorAsyncDelegateIssueTest.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/94780867/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java b/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java index a5729b3..a8ef6bc 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java +++ b/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java @@ -101,7 +101,7 @@ public abstract class DelayProcessorSupport extends DelegateAsyncProcessor { if (delay <= 0) { // no delay then continue routing log.trace("No delay for exchangeId: {}", exchange.getExchangeId()); - return super.process(exchange, callback); + return processor.process(exchange, callback); } } catch (Throwable e) { exchange.setException(e); http://git-wip-us.apache.org/repos/asf/camel/blob/94780867/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debug.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debug.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debug.java index 6343614..18c42e7 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debug.java +++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debug.java @@ -47,7 +47,7 @@ public class Debug implements InterceptStrategy { debugger.beforeProcess(exchange, target, definition); final StopWatch watch = new StopWatch(); - return super.process(exchange, new AsyncCallback() { + return processor.process(exchange, new AsyncCallback() { public void done(boolean doneSync) { long diff = watch.stop(); debugger.afterProcess(exchange, processor, definition, diff); http://git-wip-us.apache.org/repos/asf/camel/blob/94780867/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java index 263d39f..963d20d 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java +++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptor.java @@ -88,14 +88,14 @@ public class TraceInterceptor extends DelegateAsyncProcessor implements Exchange public boolean process(final Exchange exchange, final AsyncCallback callback) { // do not trace if tracing is disabled if (!tracer.isEnabled() || (routeContext != null && !routeContext.isTracing())) { - return super.process(exchange, callback); + return processor.process(exchange, callback); } // interceptor will also trace routes supposed only for TraceEvents so we need to skip // logging TraceEvents to avoid infinite looping if (exchange.getProperty(Exchange.TRACE_EVENT, false, Boolean.class)) { // but we must still process to allow routing of TraceEvents to eg a JPA endpoint - return super.process(exchange, callback); + return processor.process(exchange, callback); } final boolean shouldLog = shouldLogNode(node) && shouldLogExchange(exchange); http://git-wip-us.apache.org/repos/asf/camel/blob/94780867/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomAsyncInterceptorTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomAsyncInterceptorTest.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomAsyncInterceptorTest.java index 9f6834d..0a52c35 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomAsyncInterceptorTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointCustomAsyncInterceptorTest.java @@ -98,8 +98,8 @@ public class AsyncEndpointCustomAsyncInterceptorTest extends ContextTestSupport // we just want to count number of interceptions counter.incrementAndGet(); - // invoke super to continue routing the message - return super.process(exchange, callback); + // invoke processor to continue routing the message + return processor.process(exchange, callback); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/94780867/camel-core/src/test/java/org/apache/camel/processor/interceptor/AuditInterceptorAsyncDelegateIssueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/interceptor/AuditInterceptorAsyncDelegateIssueTest.java b/camel-core/src/test/java/org/apache/camel/processor/interceptor/AuditInterceptorAsyncDelegateIssueTest.java index 9e4a9fe..d6575c6 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/interceptor/AuditInterceptorAsyncDelegateIssueTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/interceptor/AuditInterceptorAsyncDelegateIssueTest.java @@ -92,7 +92,7 @@ public class AuditInterceptorAsyncDelegateIssueTest extends ContextTestSupport { return new DelegateAsyncProcessor(target) { public boolean process(Exchange exchange, AsyncCallback callback) { invoked = true; - return super.process(exchange, callback); + return processor.process(exchange, callback); } }; }
