From 51a5d53ef21ef1e4bd3ce847aaa6d5353be55a06 Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Sat, 29 Jun 2019 00:42:25 +0200 Subject: fix yet another lovely Gson NPE --- src/main/java/cuchaz/enigma/EnigmaProfile.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/cuchaz/enigma/EnigmaProfile.java b/src/main/java/cuchaz/enigma/EnigmaProfile.java index a5904ee..d091f53 100644 --- a/src/main/java/cuchaz/enigma/EnigmaProfile.java +++ b/src/main/java/cuchaz/enigma/EnigmaProfile.java @@ -15,13 +15,14 @@ import java.util.Optional; public final class EnigmaProfile { public static final EnigmaProfile EMPTY = new EnigmaProfile(ImmutableMap.of()); + private static final MappingSaveParameters DEFAULT_MAPPING_SAVE_PARAMETERS = new MappingSaveParameters(MappingFileNameFormat.BY_DEOBF); private static final Gson GSON = new Gson(); @SerializedName("services") private final Map serviceProfiles; @SerializedName("mapping_save_parameters") - private final MappingSaveParameters mappingSaveParameters = new MappingSaveParameters(MappingFileNameFormat.BY_DEOBF); + private final MappingSaveParameters mappingSaveParameters = null; private EnigmaProfile(Map serviceProfiles) { this.serviceProfiles = serviceProfiles; @@ -37,7 +38,8 @@ public final class EnigmaProfile { } public MappingSaveParameters getMappingSaveParameters() { - return mappingSaveParameters; + //noinspection ConstantConditions + return mappingSaveParameters != null ? EnigmaProfile.DEFAULT_MAPPING_SAVE_PARAMETERS : mappingSaveParameters; } public static class Service { -- cgit v1.2.3