Merge pull request #91 from Workiva/rap-2139-ensure-dispose-called-wh…

…en-unload-fails RAP-2139 Ensure dispose is called when onUnload fails.
Workiva · Jul 13, 2017 · 0122dfc · 0122dfc
2 parents 0a5e183 + 2bee28f
commit 0122dfc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/src/lifecycle_module.dart b/lib/src/lifecycle_module.dart
@@ -801,8 +801,12 @@ abstract class LifecycleModule extends SimpleModule
       rethrow;
     } catch (error, stackTrace) {
       _didUnloadController.addError(error, stackTrace);
-      await _postUnloadDisposable.dispose();
-      rethrow;
+      try {
+        await _disposableProxy.dispose();
+      } finally {
+        await _postUnloadDisposable.dispose();
+        rethrow;
+      }
     }
   }
 }