From 0781cee4b38f27139ac4e6a0361bde85fa5ec30f Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Tue, 8 Oct 2013 18:41:13 -0400 Subject: [PATCH] Fix NPE in TrapExit due to improper scoping of null check. --- run/src/main/scala/sbt/TrapExit.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/run/src/main/scala/sbt/TrapExit.scala b/run/src/main/scala/sbt/TrapExit.scala index 4b0de4f63..56980e3f6 100644 --- a/run/src/main/scala/sbt/TrapExit.scala +++ b/run/src/main/scala/sbt/TrapExit.scala @@ -242,10 +242,11 @@ private final class TrapExit(delegateManager: SecurityManager) extends SecurityM val t = tref.get if( (t eq null) || isDone(t)) unregister(id) - else + else { f(t) - if(isDone(t)) - unregister(id) + if(isDone(t)) + unregister(id) + } } } }