You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/09/29 15:28:07 UTC

[4/5] storm git commit: Merge branch 'STORM-2126_fix_npe_due_to_race_in_compute_new_sched_assignments' of https://github.com/abellina/storm into STORM-2126

Merge branch 'STORM-2126_fix_npe_due_to_race_in_compute_new_sched_assignments' of https://github.com/abellina/storm into STORM-2126

STORM-2126: fix NPE due to race condition in compute-new-sched-assign\u2026


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/164fd9c6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/164fd9c6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/164fd9c6

Branch: refs/heads/master
Commit: 164fd9c6e1f6dd0925858ba3fce40859e547938d
Parents: f3e4dd3 71acf9b
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Sep 29 09:25:40 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Sep 29 09:25:40 2016 -0500

----------------------------------------------------------------------
 .../sql/runtime/AbstractChannelHandler.java     | 32 ++++-----
 .../sql/runtime/AbstractValuesProcessor.java    | 33 ++++-----
 .../storm/sql/runtime/ChannelContext.java       | 32 ++++-----
 .../storm/sql/runtime/ChannelHandler.java       | 32 ++++-----
 .../org/apache/storm/sql/runtime/Channels.java  | 32 ++++-----
 .../apache/storm/sql/runtime/DataSource.java    | 32 ++++-----
 .../storm/sql/runtime/DataSourcesProvider.java  | 33 ++++-----
 .../storm/sql/runtime/DataSourcesRegistry.java  | 33 ++++-----
 .../sql/runtime/SimpleSqlTridentConsumer.java   | 17 +++++
 .../storm/sql/runtime/StormSqlFunctions.java    | 32 ++++-----
 .../trident/AbstractTridentProcessor.java       | 33 ++++-----
 pom.xml                                         |  3 +-
 .../src/clj/org/apache/storm/daemon/nimbus.clj  | 72 ++++++++------------
 13 files changed, 199 insertions(+), 217 deletions(-)
----------------------------------------------------------------------