Ensure join disposes outer stream

cujojs · Oct 2, 2014 · 96bfd02 · 96bfd02
1 parent 8bd133e
commit 96bfd02
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/combinators/join.js b/lib/combinators/join.js
@@ -43,7 +43,7 @@ function handleStep(i, index, s) {
 
 function stepOuter(i, s) {
 	if(i.done) {
-		return s.length === 1 ? i : stepJoin(replace(endOuter(s[0].stream), 0, s));
+		return s.length === 1 ? i : stepJoin(replace(endOuter(i, s[0].stream), 0, s));
 	}
 
 	return stepJoin(append(stepPair(i.value), stepAtIndex(i, 0, s)));
@@ -73,8 +73,8 @@ function stepPair(stream) {
 	return { stream: stream, i: when(stream.step, stream.state) };
 }
 
-function endOuter(stream) {
-	return { stream: stream, i: neverP };
+function endOuter(i, stream) {
+	return { stream: stream, i: disposeOuter(i, stream) };
 }
 
 function getIteration(s) {
@@ -90,6 +90,12 @@ function without(step, index, arr) {
 	}, stream.dispose(step.time, step.value, step.state));
 }
 
+function disposeOuter (i, stream) {
+	return when(function () {
+		return neverP;
+	}, stream.dispose(i.time, i.value, i.state));
+}
+
 function disposeInners(t, x, s) {
 	return all(map(function(si) {
 		return si.stream.dispose(t, x, si.i);