Recover from panics that might be generated by outName.

Signed-off-by: Jon Seymour <[email protected]>
influxdata · Apr 9, 2016 · 385bf32 · 385bf32
1 parent dd27fb6
commit 385bf32
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/join.go b/join.go
@@ -330,7 +330,15 @@ func (g *group) emitAll() error {
 }
 
 // emit a single joined set
-func (g *group) emitJoinedSet(set *joinset) error {
+func (g *group) emitJoinedSet(set *joinset) (err error) {
+	defer func() {
+		if p := recover(); p != nil {
+			var ok bool
+			if err, ok = p.(error); !ok {
+				panic(p)
+			}
+		}
+	}()
 	if set.name == "" {
 		set.name = set.First().PointName()
 	}