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 2015/11/24 18:57:16 UTC

[09/16] storm git commit: addWorkerHook shouldn't accpet null; and add test

addWorkerHook shouldn't accpet null; and add test


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

Branch: refs/heads/master
Commit: b0c37045085d37d9a9309a81ef7f3f7797d454a4
Parents: 4078d95
Author: Michael Schonfeld <mi...@schonfeld.org>
Authored: Tue Nov 17 12:28:20 2015 -0500
Committer: Michael Schonfeld <mi...@schonfeld.org>
Committed: Mon Nov 23 18:50:55 2015 -0500

----------------------------------------------------------------------
 storm-core/src/jvm/backtype/storm/topology/TopologyBuilder.java | 4 ++++
 .../test/jvm/backtype/storm/topology/TopologyBuilderTest.java   | 5 +++++
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/b0c37045/storm-core/src/jvm/backtype/storm/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/topology/TopologyBuilder.java b/storm-core/src/jvm/backtype/storm/topology/TopologyBuilder.java
index 965540e..9d2ef61 100644
--- a/storm-core/src/jvm/backtype/storm/topology/TopologyBuilder.java
+++ b/storm-core/src/jvm/backtype/storm/topology/TopologyBuilder.java
@@ -237,6 +237,10 @@ public class TopologyBuilder {
      * @param workerHook the lifecycle hook to add
      */
     public void addWorkerHook(IWorkerHook workerHook) {
+        if(null == workerHook) {
+            throw new IllegalArgumentException("WorkerHook must not be null.");
+        }
+
         _workerHooks.add(ByteBuffer.wrap(Utils.javaSerialize(workerHook)));
     }
 

http://git-wip-us.apache.org/repos/asf/storm/blob/b0c37045/storm-core/test/jvm/backtype/storm/topology/TopologyBuilderTest.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/backtype/storm/topology/TopologyBuilderTest.java b/storm-core/test/jvm/backtype/storm/topology/TopologyBuilderTest.java
index 934bd69..c0891a6 100644
--- a/storm-core/test/jvm/backtype/storm/topology/TopologyBuilderTest.java
+++ b/storm-core/test/jvm/backtype/storm/topology/TopologyBuilderTest.java
@@ -39,6 +39,11 @@ public class TopologyBuilderTest {
         builder.setSpout("spout", mock(IRichSpout.class), 0);
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void testAddWorkerHook() {
+        builder.addWorkerHook(null);
+    }
+
     // TODO enable if setStateSpout gets implemented
 //    @Test(expected = IllegalArgumentException.class)
 //    public void testSetStateSpout() {