From efea6a331525b6b1a1ef21eeca3ccd8fa86a36c5 Mon Sep 17 00:00:00 2001 From: Michael Reece Date: Thu, 16 Aug 2018 13:03:16 +0100 Subject: Update to stop exception for null transaction id Fixed issue on endpoint objects/relationships/ to prevent exception being thrown when transaction id passed to GET request is null Issue-ID: AAI-1439 Change-Id: Ib2a77063391612851149174a8bcfe356135d06ce Signed-off-by: Michael Reece --- champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'champ-service/src/main/java') diff --git a/champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java b/champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java index 58db3be..1f9400f 100644 --- a/champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java +++ b/champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java @@ -289,7 +289,7 @@ public class ChampRESTAPI { httpHeadersValidator.validateRequestHeaders(headers); ChampTransaction transaction = tId == null ? null : champDataService.getTransaction(tId); - if (transaction == null) { + if (tId != null && transaction == null) { throw new ChampServiceException("No transaction found for transaction ID: " + tId, Status.BAD_REQUEST); } retrieved = champDataService.getRelationshipsByObject(oId, Optional.ofNullable(transaction)); -- cgit 1.2.3-korg