Repository: incubator-streams Updated Branches: refs/heads/master 6f2acaa21 -> b98cb7e37
STREAMS-223 | Fixing faulty if statement logic that was causing NPEs when stream config objects were not explicitly set Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/2f11ad00 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/2f11ad00 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/2f11ad00 Branch: refs/heads/master Commit: 2f11ad004cb199096457f1c29710498fab426566 Parents: b410556 Author: Robert Douglas <[email protected]> Authored: Mon Nov 17 13:12:12 2014 -0600 Committer: Robert Douglas <[email protected]> Committed: Mon Nov 17 13:12:12 2014 -0600 ---------------------------------------------------------------------- .../apache/streams/monitoring/tasks/BroadcastMonitorThread.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/2f11ad00/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java ---------------------------------------------------------------------- diff --git a/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java b/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java index cbae7ee..2a6a8f3 100644 --- a/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java +++ b/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java @@ -140,8 +140,8 @@ public class BroadcastMonitorThread extends NotificationBroadcasterSupport imple if (streamConfig != null && streamConfig.containsKey("monitoring_broadcast_interval_ms") && streamConfig.get("monitoring_broadcast_interval_ms") != null && - streamConfig.get("monitoring_broadcast_interval_ms") instanceof Long || - streamConfig.get("monitoring_broadcast_interval_ms") instanceof Integer) { + (streamConfig.get("monitoring_broadcast_interval_ms") instanceof Long || + streamConfig.get("monitoring_broadcast_interval_ms") instanceof Integer)) { waitTime = Long.parseLong(streamConfig.get("monitoring_broadcast_interval_ms").toString()); } else { waitTime = DEFAULT_WAIT_TIME;
