fix _policy enrichment on ThingCreated event

Signed-off-by: Aleksandar Stanchev <aleksandar.stanchev@bosch.com>
eclipse-ditto · Jan 15, 2024 · 96cdbd5 · 96cdbd5
1 parent be1b9c6
commit 96cdbd5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...rg/eclipse/ditto/internal/models/signalenrichment/DittoCachingSignalEnrichmentFacade.java b/...rg/eclipse/ditto/internal/models/signalenrichment/DittoCachingSignalEnrichmentFacade.java
@@ -219,8 +219,9 @@ private CompletableFuture<JsonObject> smartUpdateCachedObject(final SignalEnrich
                 final var nextExpectedThingEventsParameters =
                         new CachingParameters(fieldSelector, thingEvents, invalidateCacheOnPolicyChange,
                                 cachingParameters.minAcceptableSeqNr);
-                result = handleNextExpectedThingEvents(cacheKey, JsonObject.empty(), nextExpectedThingEventsParameters)
-                        .toCompletableFuture();
+                result = doCacheLookup(cacheKey, dittoHeaders).thenCompose(
+                        cachedJsonObject -> handleNextExpectedThingEvents(cacheKey, cachedJsonObject,
+                                nextExpectedThingEventsParameters));
             } else {
                 // there are twin events; perform smart update
                 result = doCacheLookup(cacheKey, dittoHeaders).thenCompose(