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 2017/06/24 21:38:40 UTC
[1/3] camel git commit: CAMEL-11448: Optimise - Detect interrupted
exception in a quicker way which optimises the routing engine to be faster.
Repository: camel
Updated Branches:
refs/heads/master e3a1bdb6a -> 2dcad657c
CAMEL-11448: Optimise - Detect interrupted exception in a quicker way which optimises the routing engine to be faster.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1e1bae95
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1e1bae95
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1e1bae95
Branch: refs/heads/master
Commit: 1e1bae957705f8a6d9dabe08489cd8b70e8c4b1c
Parents: e3a1bdb
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jun 24 22:53:40 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jun 24 22:55:44 2017 +0200
----------------------------------------------------------------------
camel-core/src/main/java/org/apache/camel/Exchange.java | 1 +
.../src/main/java/org/apache/camel/impl/DefaultExchange.java | 4 ++++
.../src/main/java/org/apache/camel/util/ExchangeHelper.java | 2 +-
3 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1e1bae95/camel-core/src/main/java/org/apache/camel/Exchange.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/Exchange.java b/camel-core/src/main/java/org/apache/camel/Exchange.java
index 56e0780..b4e1992 100644
--- a/camel-core/src/main/java/org/apache/camel/Exchange.java
+++ b/camel-core/src/main/java/org/apache/camel/Exchange.java
@@ -160,6 +160,7 @@ public interface Exchange {
String INTERCEPTED_ENDPOINT = "CamelInterceptedEndpoint";
String INTERCEPT_SEND_TO_ENDPOINT_WHEN_MATCHED = "CamelInterceptSendToEndpointWhenMatched";
+ String INTERRUPTED = "CamelInterrupted";
String LANGUAGE_SCRIPT = "CamelLanguageScript";
String LOG_DEBUG_BODY_MAX_CHARS = "CamelLogDebugBodyMaxChars";
http://git-wip-us.apache.org/repos/asf/camel/blob/1e1bae95/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
index 2ae2f5b..bb9d982 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
@@ -367,6 +367,10 @@ public final class DefaultExchange implements Exchange {
// wrap throwable into an exception
this.exception = ObjectHelper.wrapCamelExecutionException(this, t);
}
+ if (t instanceof InterruptedException) {
+ // mark the exchange as interrupted due to the interrupt exception
+ setProperty(Exchange.INTERRUPTED, Boolean.TRUE);
+ }
}
public ExchangePattern getPattern() {
http://git-wip-us.apache.org/repos/asf/camel/blob/1e1bae95/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java b/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
index 11b0dac..13d08ad 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
@@ -676,7 +676,7 @@ public final class ExchangeHelper {
* @return <tt>true</tt> if interrupted, <tt>false</tt> otherwise
*/
public static boolean isInterrupted(Exchange exchange) {
- return exchange.getException(InterruptedException.class) != null;
+ return exchange.getProperty(Exchange.INTERRUPTED, false, boolean.class);
}
/**
[3/3] camel git commit: CAMEL-11379: Optimise - core type converters
to be invoked faster
Posted by da...@apache.org.
CAMEL-11379: Optimise - core type converters to be invoked faster
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2dcad657
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2dcad657
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2dcad657
Branch: refs/heads/master
Commit: 2dcad657c3e33f44244a9678cb2a37bb6dddb397
Parents: ba7eee5
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jun 24 23:38:22 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jun 24 23:38:22 2017 +0200
----------------------------------------------------------------------
.../camel/management/ManagedTypeConverterRegistryTest.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2dcad657/camel-core/src/test/java/org/apache/camel/management/ManagedTypeConverterRegistryTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedTypeConverterRegistryTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedTypeConverterRegistryTest.java
index f158571..2870115 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedTypeConverterRegistryTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedTypeConverterRegistryTest.java
@@ -69,13 +69,16 @@ public class ManagedTypeConverterRegistryTest extends ManagementTestSupport {
Long miss = (Long) mbeanServer.getAttribute(name, "MissCounter");
assertEquals(0, miss.intValue());
+ // reset
+ mbeanServer.invoke(name, "resetTypeConversionCounters", null, null);
+
template.sendBody("direct:start", "5");
// should hit
Long hit = (Long) mbeanServer.getAttribute(name, "HitCounter");
- assertEquals(1, hit.intValue());
+ assertEquals(3, hit.intValue());
Long coreHit = (Long) mbeanServer.getAttribute(name, "CoreHitCounter");
- assertEquals(1, coreHit.intValue());
+ assertEquals(3, coreHit.intValue());
failed = (Long) mbeanServer.getAttribute(name, "FailedCounter");
assertEquals(0, failed.intValue());
miss = (Long) mbeanServer.getAttribute(name, "MissCounter");
[2/3] camel git commit: Optimise - Is a tiny faster as the extra add
is not needed as we dont use the returned value.
Posted by da...@apache.org.
Optimise - Is a tiny faster as the extra add is not needed as we dont use the returned value.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ba7eee50
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ba7eee50
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ba7eee50
Branch: refs/heads/master
Commit: ba7eee50f55170f719861f94b0f84b83d89d313a
Parents: 1e1bae9
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jun 24 23:00:00 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jun 24 23:00:00 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/management/mbean/StatisticCounter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ba7eee50/camel-core/src/main/java/org/apache/camel/management/mbean/StatisticCounter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/StatisticCounter.java b/camel-core/src/main/java/org/apache/camel/management/mbean/StatisticCounter.java
index 27620c7..e2e3839 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/StatisticCounter.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/StatisticCounter.java
@@ -23,7 +23,7 @@ public class StatisticCounter extends Statistic {
private final AtomicLong value = new AtomicLong(0);
public void updateValue(long newValue) {
- value.addAndGet(newValue);
+ value.getAndAdd(newValue);
}
public long getValue() {