commit 0be62fe6d33f71aa707b697a108be012ca513d0d
author Nathan Marz <nathan@twitter.com> Fri Jan 11 14:43:30 2013 -0800
committer Nathan Marz <nathan@twitter.com> Fri Jan 11 14:43:30 2013 -0800
tree 8db960021e5100d7ff7bf85adfeb4ae50e5c0342
parent 843c86e7c5cd4fd33af5bc6f3022c2ce070f2670
parent 7b2139181ed1f5f3961a0ea5f45571a40aa04f60

Merge branch 'master' into 0.8.2

src/jvm/backtype/storm/spout/SchemeAsMultiScheme.java

diff --git a/src/jvm/backtype/storm/spout/SchemeAsMultiScheme.java b/src/jvm/backtype/storm/spout/SchemeAsMultiScheme.java
index 3ce96c9..dab4ff8 100644
--- a/src/jvm/backtype/storm/spout/SchemeAsMultiScheme.java
+++ b/src/jvm/backtype/storm/spout/SchemeAsMultiScheme.java
@@ -13,7 +13,9 @@
   }
 
   @Override public Iterable<List<Object>> deserialize(final byte[] ser) {
-    return Arrays.asList(scheme.deserialize(ser));
+    List<Object> o = scheme.deserialize(ser);
+    if(o == null) return null;
+    else return Arrays.asList(o);
   }
 
   @Override public Fields getOutputFields() {