You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2014/11/19 21:08:00 UTC
[1/2] incubator-streams git commit: STREAMS-223 | Fixing faulty if
statement logic that was causing NPEs when stream config objects were not
explicitly set
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 <rd...@w2ogroup.com>
Authored: Mon Nov 17 13:12:12 2014 -0600
Committer: Robert Douglas <rd...@w2ogroup.com>
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;
[2/2] incubator-streams git commit: Merge commit
'2f11ad004cb199096457f1c29710498fab426566'
Posted by sb...@apache.org.
Merge commit '2f11ad004cb199096457f1c29710498fab426566'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/b98cb7e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/b98cb7e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/b98cb7e3
Branch: refs/heads/master
Commit: b98cb7e37692249215598b3265450f265f3b6645
Parents: 6f2acaa 2f11ad0
Author: sblackmon <sb...@apache.org>
Authored: Wed Nov 19 14:07:47 2014 -0600
Committer: sblackmon <sb...@apache.org>
Committed: Wed Nov 19 14:07:47 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------