Perform getBuildListenerBroadcaster().projectsLoaded() in finally block

gradle · Jul 5, 2017 · 461bac2 · 461bac2
1 parent c381a8e
commit 461bac2
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/subprojects/core/src/main/java/org/gradle/initialization/NotifyingSettingsLoader.java b/subprojects/core/src/main/java/org/gradle/initialization/NotifyingSettingsLoader.java
@@ -32,8 +32,11 @@ public NotifyingSettingsLoader(SettingsLoader settingsLoader, BuildLoader buildL
     public SettingsInternal findAndLoadSettings(GradleInternal gradle) {
         SettingsInternal settings = settingsLoader.findAndLoadSettings(gradle);
         gradle.getBuildListenerBroadcaster().settingsEvaluated(settings);
-        buildLoader.load(settings.getRootProject(), settings.getDefaultProject(), gradle, settings.getRootClassLoaderScope());
-        gradle.getBuildListenerBroadcaster().projectsLoaded(gradle);
+        try {
+            buildLoader.load(settings.getRootProject(), settings.getDefaultProject(), gradle, settings.getRootClassLoaderScope());
+        } finally {
+            gradle.getBuildListenerBroadcaster().projectsLoaded(gradle);
+        }
         return settings;
     }
 }