Merge branch '2.6.x' into 2.7.x

Closes gh-32678

Author: wilkinsona

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java

@@ -129,12 +129,15 @@ private void registerPluginActions(Project project, Configuration bootArchives)
 
 	private void withPluginClassOfAction(PluginApplicationAction action,
 			Consumer<Class<? extends Plugin<? extends Project>>> consumer) {
+		Class<? extends Plugin<? extends Project>> pluginClass;
 		try {
-			consumer.accept(action.getPluginClass());
+			pluginClass = action.getPluginClass();
 		}
 		catch (Throwable ex) {
-			// Plugin class unavailable. Continue.
+			// Plugin class unavailable.
+			return;
 		}
+		consumer.accept(pluginClass);
 	}
 
 }