Gracefully handle profiles in settings.xml with no <activation>

See gh-3483

Gracefully handle profiles in settings.xml with no <activation>
See gh-3483
5e4a4500 · Andy Wilkinson · 73b24455 · 5e4a4500
Commit 5e4a4500 authored Jul 14, 2015 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

MavenSettings.java .../org/springframework/boot/cli/compiler/MavenSettings.java +3 -1

No files found.
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/MavenSettings.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/MavenSettings.java
@@ -165,7 +165,9 @@ public class MavenSettings {
 		for (Profile profile : profiles) {
 			org.apache.maven.model.Profile modelProfile = new org.apache.maven.model.Profile();
 			modelProfile.setId(profile.getId());
-			modelProfile.setActivation(createModelActivation(profile.getActivation()));
+			if (profile.getActivation() != null) {
+				modelProfile.setActivation(createModelActivation(profile.getActivation()));
+			}
 			modelProfiles.add(modelProfile);
 		}
 		return modelProfiles;