From 655e7c7ba9e4bed011e09076138031921ebca6d0 Mon Sep 17 00:00:00 2001 From: Swapan Shridhar Date: Tue, 6 Mar 2018 12:56:01 -0800 Subject: [PATCH] AMBARI-23158. Fix NPE in Host Components query. --- .../internal/HostComponentResourceProvider.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java index 9b0f69bff6e..a9bc8030e00 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java @@ -730,13 +730,13 @@ protected Set getPKPropertyIds() { * @return the component request object */ private ServiceComponentHostRequest getRequest(Map properties) { - ServiceComponentHostRequest serviceComponentHostRequest = null; + Long hostComponentId = null; if (properties.get(HOST_COMPONENT_HOST_COMPONENT_ID_PROPERTY_ID) != null) { - Long hostComponentId = properties.get(HOST_COMPONENT_HOST_COMPONENT_ID_PROPERTY_ID) instanceof String ? + hostComponentId = properties.get(HOST_COMPONENT_HOST_COMPONENT_ID_PROPERTY_ID) instanceof String ? Long.parseLong((String) properties.get(HOST_COMPONENT_HOST_COMPONENT_ID_PROPERTY_ID)) : (Long) properties.get(HOST_COMPONENT_HOST_COMPONENT_ID_PROPERTY_ID); - - serviceComponentHostRequest = new ServiceComponentHostRequest( + } + ServiceComponentHostRequest serviceComponentHostRequest = new ServiceComponentHostRequest( (String) properties.get(HOST_COMPONENT_CLUSTER_NAME_PROPERTY_ID), (String) properties.get(HOST_COMPONENT_SERVICE_GROUP_NAME_PROPERTY_ID), (String) properties.get(HOST_COMPONENT_SERVICE_NAME_PROPERTY_ID), @@ -745,7 +745,6 @@ private ServiceComponentHostRequest getRequest(Map properties) { (String) properties.get(HOST_COMPONENT_COMPONENT_TYPE_PROPERTY_ID), (String) properties.get(HOST_COMPONENT_HOST_NAME_PROPERTY_ID), (String) properties.get(HOST_COMPONENT_DESIRED_STATE_PROPERTY_ID)); - } serviceComponentHostRequest.setState((String) properties.get(HOST_COMPONENT_STATE_PROPERTY_ID)); if (properties.get(HOST_COMPONENT_STALE_CONFIGS_PROPERTY_ID) != null) {