Merge pull request Netflix#1155 from mgtriffid/eureka-1154

elandau · web-flow · commit 0f960da863ad · 2018-11-14T13:54:58.000-08:00
EUREKA-1154 Return 404 if instance is not found when updating metadata
diff --git a/eureka-core/src/main/java/com/netflix/eureka/resources/InstanceResource.java b/eureka-core/src/main/java/com/netflix/eureka/resources/InstanceResource.java
@@ -118,7 +118,7 @@ public Response renewLease(
         }
         // Check if we need to sync based on dirty time stamp, the client
         // instance might have changed some value
-        Response response = null;
+        Response response;
         if (lastDirtyTimestamp != null && serverConfig.shouldSyncWhenTimestampDiffers()) {
             response = this.validateDirtyTimestamp(Long.valueOf(lastDirtyTimestamp), isFromReplicaNode);
             // Store the overridden status since the validation found out the node that replicates wins
@@ -239,15 +239,15 @@ public Response updateMetadata(@Context UriInfo uriInfo) {
             InstanceInfo instanceInfo = registry.getInstanceByAppAndId(app.getName(), id);
             // ReplicationInstance information is not found, generate an error
             if (instanceInfo == null) {
-                logger.error("Cannot find instance while updating metadata for instance {}", id);
-                return Response.serverError().build();
+                logger.warn("Cannot find instance while updating metadata for instance {}/{}", app.getName(), id);
+                return Response.status(Status.NOT_FOUND).build();
             }
             MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters();
             Set<Entry<String, List<String>>> entrySet = queryParams.entrySet();
             Map<String, String> metadataMap = instanceInfo.getMetadata();
             // Metadata map is empty - create a new map
             if (Collections.emptyMap().getClass().equals(metadataMap.getClass())) {
-                metadataMap = new ConcurrentHashMap<String, String>();
+                metadataMap = new ConcurrentHashMap<>();
                 InstanceInfo.Builder builder = new InstanceInfo.Builder(instanceInfo);
                 builder.setMetadata(metadataMap);
                 instanceInfo = builder.build();
