From: Steven Blimkie Date: Thu, 15 Aug 2019 21:01:13 +0000 (+0000) Subject: Merge "Upversion data-router in master" X-Git-Tag: 1.6.1~5 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fdata-router.git;a=commitdiff_plain;h=5f8a8eed09b22bf9f849607e743ae1fe57433eb1;hp=ddebff31a76704d05d7d9fabe1733cc49d30216b Merge "Upversion data-router in master" --- diff --git a/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java b/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java index 152baf3..ec76c95 100644 --- a/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java +++ b/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java @@ -4,6 +4,7 @@ * ================================================================================ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. * Copyright © 2017-2018 Amdocs + * Modifications Copyright (C) 2019 IBM * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -410,7 +411,8 @@ public class EntityEventPolicy implements Processor { JSONObject entityJsonObject = getUebEntity(uebPayload); - JsonNode entityJsonNode = convertToJsonNode(entityJsonObject.toString()); + JsonNode entityJsonNode = + convertToJsonNode(entityJsonObject !=null ? entityJsonObject.toString() : ""); String parentEntityType = entityType;