Prevent Jack.check to leak a Config

(Cherry-pick from commit da68d3cf11ed2354878bc7cd97d1c2ef40ddb0bd)

Change-Id: I783b3880829f3a5f8abd17d048432330ed782be8

1 files changed, 6 insertions, 3 deletions

diff --git a/jack/src/com/android/jack/Jack.java b/jack/src/com/android/jack/Jack.java
index 554905c..04b172b 100644
--- a/jack/src/com/android/jack/Jack.java
+++ b/jack/src/com/android/jack/Jack.java
@@ -394,7 +394,6 @@ public abstract class Jack {
 
     Config config = options.getConfig();
 
-    ThreadConfig.setConfig(config);
 
     boolean sanityChecks = config.get(Options.SANITY_CHECKS).booleanValue();
 
@@ -412,12 +411,14 @@ public abstract class Jack {
   public static void run(@Nonnull Options options, @Nonnull RunnableHooks hooks)
       throws JackUserException, ProcessException {
 
-    Event event = TracerFactory.getTracer().start(JackEventType.JACK_RUN);
+    Event event = null;
 
     try {
       Config config = options.getConfig();
       ThreadConfig.setConfig(config);
 
+      event = TracerFactory.getTracer().start(JackEventType.JACK_RUN);
+
       ConfigPrinterFactory.getConfigPrinter().printConfig(config);
 
       JSession session = getSession();
@@ -613,8 +614,10 @@ public abstract class Jack {
         }
       }
     } finally {
+      if (event != null) {
+        event.end();
+      }
       ThreadConfig.unsetConfig();
-      event.end();
     }
   }