Simplify.

dvgica · Nov 25, 2021 · d3ca69c · d3ca69c
1 parent ab58b1c
commit d3ca69c
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/managerial/src/main/scala/ca/dvgi/managerial/Managed.scala b/managerial/src/main/scala/ca/dvgi/managerial/Managed.scala
@@ -71,23 +71,19 @@ trait Managed[+T] { selfT =>
     def build() = new Resource[U] {
       private val t = selfT.build()
 
-      private var toThrow: Throwable = null
-
       private val u =
         try {
           f(t.get).build()
         } catch {
-          case throwable: Throwable =>
-            toThrow = throwable
-
+          case setupThrowable: Throwable =>
             try {
               t.teardown()
             } catch {
-              case throwable: Throwable =>
-                toThrow.addSuppressed(throwable)
+              case teardownThrowable: Throwable =>
+                setupThrowable.addSuppressed(teardownThrowable)
             }
 
-            throw toThrow
+            throw setupThrowable
         }
 
       def get = u.get