From aff7c021e37e64162ce4e3fe5abd419072fb464f Mon Sep 17 00:00:00 2001
From: Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>
Date: Thu, 16 May 2019 14:26:03 +0200
Subject: Refactor + Document in preprocess

- Refactor: Move ConfigType.merge's null check to caller.
- Revise documentation of preprocess' public methods.
---
 .../java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java')

diff --git a/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java b/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java
index f3a05d1..057c3d4 100644
--- a/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java
+++ b/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java
@@ -49,7 +49,9 @@ public class DeliveryRequestAugmenter {
 
         } else {
 
-            var mergedConfig = util.merge(requestConfig, fallbackConfig);
+            var mergedConfig = (requestConfig == null)
+                    ? fallbackConfig
+                    : util.merge(requestConfig, fallbackConfig);
 
             if (util.isComplete(mergedConfig)) {
                 return deliveryRequestTypeBuilder(request)
-- 
cgit v1.2.3