Repository: storm Updated Branches: refs/heads/master bc2293a3d -> dd3dacbbe
A better way to get default value Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6e5e8f01 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6e5e8f01 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6e5e8f01 Branch: refs/heads/master Commit: 6e5e8f012d88c3db1c1e4666adbc7970411a44c1 Parents: 85d87ee Author: lujinhong <lujinho...@gmail.com> Authored: Thu Jul 21 15:45:12 2016 +0800 Committer: lujinhong <lujinho...@gmail.com> Committed: Thu Jul 21 15:45:12 2016 +0800 ---------------------------------------------------------------------- .../storm/transactional/TransactionalSpoutCoordinator.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/6e5e8f01/storm-core/src/jvm/org/apache/storm/transactional/TransactionalSpoutCoordinator.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/transactional/TransactionalSpoutCoordinator.java b/storm-core/src/jvm/org/apache/storm/transactional/TransactionalSpoutCoordinator.java index b49c645..aff054b 100644 --- a/storm-core/src/jvm/org/apache/storm/transactional/TransactionalSpoutCoordinator.java +++ b/storm-core/src/jvm/org/apache/storm/transactional/TransactionalSpoutCoordinator.java @@ -77,12 +77,7 @@ public class TransactionalSpoutCoordinator extends BaseRichSpout { _collector = collector; _coordinator = _spout.getCoordinator(conf, context); _currTransaction = getStoredCurrTransaction(_state); - Object active = conf.get(Config.TOPOLOGY_MAX_SPOUT_PENDING); - if(active==null) { - _maxTransactionActive = 1; - } else { - _maxTransactionActive = Utils.getInt(active); - } + _maxTransactionActive = Utils.getInt(conf.get(Config.TOPOLOGY_MAX_SPOUT_PENDING), 1); _initializer = new StateInitializer(); }
