diff options
Diffstat (limited to 'src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileMerger.java')
-rw-r--r-- | src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileMerger.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileMerger.java b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileMerger.java index f25ec12..c94723e 100644 --- a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileMerger.java +++ b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileMerger.java @@ -32,6 +32,10 @@ public class ConfigProfileMerger { private ServerType merge(ServerType primary, ServerType fallback) { + if (fallback == null) { + return primary; + } + var builder = serverTypeBuilder(fallback); if (primary.getX509() != null) builder.withX509 (primary.getX509() ); |