fix entityId retrieval for when no "id" was selected via fields

eclipse-ditto · Feb 20, 2024 · c7c0d6d · c7c0d6d
1 parent 335a26c
commit c7c0d6d
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/...ain/java/org/eclipse/ditto/gateway/service/endpoints/actors/AbstractHttpRequestActor.java b/...ain/java/org/eclipse/ditto/gateway/service/endpoints/actors/AbstractHttpRequestActor.java
@@ -336,11 +336,13 @@ private void handleCommandAndAcceptImmediately(final Signal<?> command) {
     }
 
     private void rememberResponseLocationUri(final CommandResponse<?> commandResponse) {
-        final var optionalEntityId = WithEntityId.getEntityId(commandResponse);
-        if (HttpStatus.CREATED.equals(commandResponse.getHttpStatus()) && optionalEntityId.isPresent()) {
-            responseLocationUri =
-                    getUriForLocationHeader(httpRequest, optionalEntityId.get(), commandResponse.getResourcePath());
-            logger.debug("Setting responseLocationUri=<{}> from request <{}>", responseLocationUri, httpRequest);
+        if (HttpStatus.CREATED.equals(commandResponse.getHttpStatus())) {
+            final var optionalEntityId = WithEntityId.getEntityId(commandResponse);
+            if (optionalEntityId.isPresent()) {
+                responseLocationUri =
+                        getUriForLocationHeader(httpRequest, optionalEntityId.get(), commandResponse.getResourcePath());
+                logger.debug("Setting responseLocationUri=<{}> from request <{}>", responseLocationUri, httpRequest);
+            }
         }
     }