fix: uncancellable was not forwarding errors to the result promise

etschannen · etschannen · commit 19fa31ffff3f · 2017-07-27T13:29:08.000-07:00
diff --git a/flow/genericactors.actor.h b/flow/genericactors.actor.h
@@ -239,8 +239,12 @@ Future<Void> triggerOnError( Func what, Future<Void> signal ) {
 ACTOR template<class T>
 void uncancellable(Future<T> what, Promise<T> result)
 {
-	T val = wait(what);
-	result.send(val);
+	try {
+		T val = wait(what);
+		result.send(val);
+	} catch( Error &e ) {
+		result.sendError(e);
+	}
 }
 
 //Waits for a future to complete and cannot be cancelled

Original file line number	Diff line number	Diff line change
`@@ -239,8 +239,12 @@ Future<Void> triggerOnError( Func what, Future<Void> signal ) {`
`239`	`239`	`ACTOR template<class T>`
`240`	`240`	`void uncancellable(Future<T> what, Promise<T> result)`
`241`	`241`	`{`
`242`		`- T val = wait(what);`
`243`		`- result.send(val);`
	`242`	`+ try {`
	`243`	`+ T val = wait(what);`
	`244`	`+ result.send(val);`
	`245`	`+ } catch( Error &e ) {`
	`246`	`+ result.sendError(e);`
	`247`	`+ }`
`244`	`248`	`}`
`245`	`249`
`246`	`250`	`//Waits for a future to complete and cannot be cancelled`