fixes SchemeAsMultiScheme bug, when deserialize returns null

Jason Jackson · Jason Jackson · commit cf7cb81451b8 · 2013-01-10T04:18:06.000-08:00
diff --git a/src/jvm/backtype/storm/spout/SchemeAsMultiScheme.java b/src/jvm/backtype/storm/spout/SchemeAsMultiScheme.java
@@ -13,7 +13,9 @@ public SchemeAsMultiScheme(Scheme scheme) {
   }
 
   @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() {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@ public SchemeAsMultiScheme(Scheme scheme) {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`@Override public Iterable<List<Object>> deserialize(final byte[] ser) {`
`16`		`- return Arrays.asList(scheme.deserialize(ser));`
	`16`	`+ List<Object> o = scheme.deserialize(ser);`
	`17`	`+ if(o == null) return null;`
	`18`	`+ else return Arrays.asList(o);`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`@Override public Fields getOutputFields() {`