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/01/20 09:36:14 UTC
[3/5] camel git commit: replace changes lost in merge
replace changes lost in merge
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dd227460
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dd227460
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dd227460
Branch: refs/heads/master
Commit: dd22746086e769aa85eb3019b2c9de88beeabff5
Parents: 5351baa
Author: CodeSmell <mb...@gmail.com>
Authored: Thu Jan 19 17:13:02 2017 -0500
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 20 09:45:52 2017 +0100
----------------------------------------------------------------------
.../camel/impl/ThrottlingExceptionRoutePolicy.java | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dd227460/camel-core/src/main/java/org/apache/camel/impl/ThrottlingExceptionRoutePolicy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ThrottlingExceptionRoutePolicy.java b/camel-core/src/main/java/org/apache/camel/impl/ThrottlingExceptionRoutePolicy.java
index e23e1bc..aac5ee2 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ThrottlingExceptionRoutePolicy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ThrottlingExceptionRoutePolicy.java
@@ -231,7 +231,10 @@ public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implement
try {
lock.lock();
startConsumer(route.getConsumer());
- this.reset();
+ failures.set(0);
+ lastFailure = 0;
+ openedAt = 0;
+ state.set(STATE_CLOSED);
logState();
} catch (Exception e) {
handleException(e);
@@ -240,13 +243,6 @@ public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implement
}
}
- private void reset() {
- failures.set(0);
- lastFailure = 0;
- openedAt = 0;
- state.set(STATE_CLOSED);
- }
-
private void logState() {
if (LOG.isDebugEnabled()) {
LOG.debug(dumpState());