diff options
author | Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at> | 2019-05-15 14:55:09 +0200 |
---|---|---|
committer | Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at> | 2019-05-15 14:55:09 +0200 |
commit | 6959228c5c557df0204a2902807b35d90063b600 (patch) | |
tree | 1c32e2b63d0fd8c290d81b569470eea2c7fd5c1a /src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileMerger.java | |
parent | cb95ee0650d3bbc3fe619af0a687f09d39a0a07f (diff) | |
download | moa-zs-6959228c5c557df0204a2902807b35d90063b600.tar.gz moa-zs-6959228c5c557df0204a2902807b35d90063b600.tar.bz2 moa-zs-6959228c5c557df0204a2902807b35d90063b600.zip |
Handle Config Related Edge Cases in Augmenter & ProfileGenerator
ConfigProfileGenerator:
- Cancel startup if default Config profile is incomplete.
- Add property flag
'verify-completeness-of-default-delivery-request-configuration',
which allows admin to disable completeness check. In that case, just
log a warning if the default profile is incomplete.
Augmenter:
- Ensure that after merging the config is complete (or throw an
exception otherwise).
- Refactor: Move ConfigProfileValidator from ConfigProfileGenerator to
dedicated "ConfigProfileValidator" class; Reason: Augmenter needs to
check completness of at-runtime-compiled configuration.
- Refactor: Rewrote code for better readability.
Others
- NPE Fix in ConfigProfileMerger: If FallbackConfigProfile/Server is
empty, use PrimaryProfile/Server.
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() ); |