Merge pull request #3 from sbearcsiro/feature/fix-stream-exception

graemerocher · web-flow · commit 05de7f329352 · 2017-02-13T16:50:24.000+01:00
Fix #2 A thrown exception in rx.stream(Closure) does not close the ev…
diff --git a/src/main/groovy/org/grails/plugins/rx/web/RxResultTransformer.groovy b/src/main/groovy/org/grails/plugins/rx/web/RxResultTransformer.groovy
@@ -74,7 +74,7 @@ class RxResultTransformer implements ActionResultTransformer {
             // Create the Async web request and register it with the WebAsyncManager so Spring is aware
             WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request)
 
-            AsyncWebRequest asyncWebRequest = new AsyncGrailsWebRequest(
+            AsyncGrailsWebRequest asyncWebRequest = new AsyncGrailsWebRequest(
                     request,
                     response,
                     webRequest.servletContext)
@@ -122,15 +122,15 @@ class RxResultTransformer implements ActionResultTransformer {
                 }
             }
             else {
-                NewObservableResult newObservableResult = (NewObservableResult)actionResult
-                Observable newObservable = Observable.create( { ObservableEmitter newSub ->
-                    asyncContext.start {
+                asyncContext.start {
+                    NewObservableResult newObservableResult = (NewObservableResult)actionResult
+                    Observable newObservable = Observable.create( { ObservableEmitter newSub ->
                         Closure callable = newObservableResult.callable
                         callable.setDelegate(newSub)
                         callable.call(newSub)
-                    }
-                } as ObservableOnSubscribe)
-                newObservable.subscribe(subscriber)
+                    } as ObservableOnSubscribe)
+                    newObservable.subscribe(subscriber)
+                }
             }
             // return null indicating that the request thread should be returned to the thread pool
             // async request processing will take over
