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

[1/3] storm git commit: STORM-1594 org.apache.storm.tuple.Fields can throw NPE if given invalid field in selector

Repository: storm
Updated Branches:
  refs/heads/1.0.x-branch 426c790f3 -> e104f9f37


STORM-1594 org.apache.storm.tuple.Fields can throw NPE if given invalid field in selector

* Closes #1522


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

Branch: refs/heads/1.0.x-branch
Commit: de9b0f7a7869b21db251d44a404644a89e3c9137
Parents: 426c790
Author: lujinhong <lu...@gmail.com>
Authored: Mon Jun 27 10:33:28 2016 +0800
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sun Jul 31 23:34:31 2016 +0900

----------------------------------------------------------------------
 storm-core/src/jvm/org/apache/storm/tuple/Fields.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/de9b0f7a/storm-core/src/jvm/org/apache/storm/tuple/Fields.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/tuple/Fields.java b/storm-core/src/jvm/org/apache/storm/tuple/Fields.java
index bfa22cb..8945a73 100644
--- a/storm-core/src/jvm/org/apache/storm/tuple/Fields.java
+++ b/storm-core/src/jvm/org/apache/storm/tuple/Fields.java
@@ -50,8 +50,8 @@ public class Fields implements Iterable<String>, Serializable {
     
     public List<Object> select(Fields selector, List<Object> tuple) {
         List<Object> ret = new ArrayList<>(selector.size());
-        for(String s: selector) {
-            ret.add(tuple.get(_index.get(s)));
+        for (String s : selector) {
+            ret.add(tuple.get(fieldIndex(s))); 
         }
         return ret;
     }


[3/3] storm git commit: add STORM-1594 to CHANGELOG

Posted by ka...@apache.org.
add STORM-1594 to CHANGELOG


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

Branch: refs/heads/1.0.x-branch
Commit: e104f9f37949dd49389466ecb6018524a4e44ba3
Parents: 67f443e
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sun Jul 31 23:39:08 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sun Jul 31 23:39:08 2016 +0900

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/e104f9f3/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 438fc31..7b8f0ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.0.3
+ * STORM-1594: org.apache.storm.tuple.Fields can throw NPE if given invalid field in selector
  * STORM-1995: downloadChunk in nimbus.clj should close the input stream
 
 ## 1.0.2


[2/3] storm git commit: Merge branch 'STORM-1594-1.0.x' into 1.0.x-branch

Posted by ka...@apache.org.
Merge branch 'STORM-1594-1.0.x' into 1.0.x-branch


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

Branch: refs/heads/1.0.x-branch
Commit: 67f443ec3364b67164e3eb0011c20754b8fd8124
Parents: 426c790 de9b0f7
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sun Jul 31 23:38:46 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sun Jul 31 23:38:46 2016 +0900

----------------------------------------------------------------------
 storm-core/src/jvm/org/apache/storm/tuple/Fields.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------