From b08bb3b7a0b508589ecb7187a77076f107a78ae6 Mon Sep 17 00:00:00 2001 From: Holash Chand Date: Sat, 4 Nov 2023 20:13:06 +0530 Subject: [PATCH] fixed elocker null pointer exception --- .../dev/sunbirdrc/registry/helper/RegistryHelper.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/java/registry/src/main/java/dev/sunbirdrc/registry/helper/RegistryHelper.java b/java/registry/src/main/java/dev/sunbirdrc/registry/helper/RegistryHelper.java index da782e16b..575292937 100644 --- a/java/registry/src/main/java/dev/sunbirdrc/registry/helper/RegistryHelper.java +++ b/java/registry/src/main/java/dev/sunbirdrc/registry/helper/RegistryHelper.java @@ -432,8 +432,13 @@ public String triggerAttestation(AttestationRequest attestationRequest, Attestat updateGetFileUrl(attestationRequest.getAdditionalInput()); + String propertyData = null; + if (attestationRequest.getPropertyData() != null) { + propertyData = attestationRequest.getPropertyData().toString(); + } + PluginRequestMessage message = PluginRequestMessageCreator.create( - attestationRequest.getPropertyData().toString(), condition, attestationOSID, attestationRequest.getEntityName(), + propertyData, condition, attestationOSID, attestationRequest.getEntityName(), attestationRequest.getEmailId(), attestationRequest.getEntityId(), attestationRequest.getAdditionalInput(), Action.RAISE_CLAIM.name(), attestationPolicy.getName(), attestationPolicy.getAttestorPlugin(), attestationPolicy.getAttestorEntity(), attestationPolicy.getAttestorSignin(), @@ -482,7 +487,9 @@ private void addAttestationProperty(AttestationRequest attestationRequest) throw JsonNode parentNode = nodeToUpdate.get(attestationRequest.getEntityName()); JsonNode propertyNode = parentNode.get(attestationRequest.getName()); ObjectNode attestationJsonNode = (ObjectNode) JSONUtil.convertObjectJsonNode(attestationRequest); - attestationJsonNode.set("propertyData", JsonNodeFactory.instance.textNode(attestationRequest.getPropertyData().toString())); + if (attestationRequest.getPropertyData() != null) { + attestationJsonNode.set("propertyData", JsonNodeFactory.instance.textNode(attestationRequest.getPropertyData().toString())); + } createOrUpdateProperty(attestationRequest.getEntityName(), attestationJsonNode, nodeToUpdate, attestationRequest.getName(), (ObjectNode) parentNode, propertyNode); updateEntityAndState(existingEntityNode, nodeToUpdate, attestationRequest.getUserId()); }