Merge branch 'CAMEL-7504' of https://github.com/davidkarlsen/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0cb6e842 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0cb6e842 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0cb6e842 Branch: refs/heads/master Commit: 0cb6e8426d9346a5fb1da4ff9ec5ac023b9b5190 Parents: 61839f2 e7eddb0 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Jul 2 21:00:06 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Jul 2 21:00:06 2014 +0200 ---------------------------------------------------------------------- .../org/apache/camel/model/ThrottleDefinition.java | 2 +- .../java/org/apache/camel/processor/Throttler.java | 16 +++++----------- .../ThrottlerRejectedExecutionException.java | 15 +++++++++++++++ .../org/apache/camel/processor/ThrottlerTest.java | 10 +++++----- .../org/apache/camel/spring/processor/throttler.xml | 2 +- 5 files changed, 27 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
