[#889] fixed that protocol headers was not merged with calculated hea…

…ders e.g. containing authentication information Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Nov 30, 2020 · d0ee654 · d0ee654
1 parent dc4dc6c
commit d0ee654
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...ava/org/eclipse/ditto/services/gateway/endpoints/routes/cloudevents/CloudEventsRoute.java b/...ava/org/eclipse/ditto/services/gateway/endpoints/routes/cloudevents/CloudEventsRoute.java
@@ -249,9 +249,10 @@ private Optional<Signal<?>> jsonToDittoSignal(@Nullable final CloudEventData dat
                 .build();
 
         final JsonifiableAdaptable jsonifiableAdaptable = ProtocolFactory.jsonifiableAdaptableFromJson(jsonObject);
-        return Optional.of(PROTOCOL_ADAPTER
-                .fromAdaptable(jsonifiableAdaptable)
-                .setDittoHeaders(adjustedHeaders));
+        final Signal<?> signal = PROTOCOL_ADAPTER.fromAdaptable(jsonifiableAdaptable);
+        final Signal<?> signalWithAdjustedHeaders = signal.setDittoHeaders(
+                        signal.getDittoHeaders().toBuilder().putHeaders(adjustedHeaders).build());
+        return Optional.of(signalWithAdjustedHeaders);
     }
 
     private void ensureDataContentType(@Nullable final String dataContentType,