From 152c7224f40561d33e18623b1e64155eec0709d6 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 29 Jun 2018 23:05:11 +0200 Subject: [PATCH] Should not throw NPE for metarelease and trying to pick an option from a console --- .../cloud/release/internal/spring/OptionsProcessor.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsProcessor.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsProcessor.java index 48ab06d3..72fc2f96 100644 --- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsProcessor.java +++ b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsProcessor.java @@ -39,12 +39,16 @@ class OptionsProcessor { void processOptions(Options options, Args defaultArgs, List tasks) { Args args = args(defaultArgs, options.interactive); if (args.taskType == TaskType.POST_RELEASE) { + if (options.metaRelease) { + postReleaseTask().execute(args); + return; + } String chosenOption = chosenOption(); int pickedInteger = Integer.parseInt(chosenOption); boolean pickedOptionIsComposite = pickedInteger <= 1; boolean pickedOptionIsFromPostRelease = pickedInteger >= Tasks.ALL_TASKS_PER_PROJECT.size() - Tasks.DEFAULT_TASKS_PER_RELEASE.size(); - if (options.fullRelease || pickedOptionIsComposite) { + if (options.metaRelease || options.fullRelease || pickedOptionIsComposite) { postReleaseTask().execute(args); } else if (pickedOptionIsFromPostRelease) { processNonComposite(options, tasks, args);