From a90eb56177c2e832e71f3329a624583d4ffb36b4 Mon Sep 17 00:00:00 2001 From: Jegadeesh Babu Date: Fri, 22 Feb 2019 15:42:02 +0530 Subject: [PATCH] Resolved merge conflict Resolved conflict Issue-ID: APPC-1474 Change-Id: I2c46a69b112aa3b3796fcb2939b34a8c604e5119 Signed-off-by: Jegadeesh Babu --- .../src/main/java/org/onap/appc/client/impl/core/CoreManager.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/core/CoreManager.java b/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/core/CoreManager.java index 5bb7f56a3..4c0c535d4 100644 --- a/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/core/CoreManager.java +++ b/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/core/CoreManager.java @@ -6,6 +6,8 @@ * ================================================================================ * Copyright (C) 2017 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. * You may obtain a copy of the License at @@ -225,6 +227,7 @@ class CoreManager{ forceShutdown(); } catch (InterruptedException e) { LOG.error("Interrupted Exception during gracefulShutdown ::", e); + Thread.currentThread().interrupt(); } } @@ -242,6 +245,7 @@ class CoreManager{ timerService.shutdown(); } catch (InterruptedException e) { LOG.info("Client library shutdown in progress ", e); + Thread.currentThread().interrupt(); } } @@ -284,6 +288,7 @@ class CoreManager{ }); } catch (InterruptedException e) { LOG.warn("could not submit timeout task for correlation ID <" + corrID + "> ", e); + Thread.currentThread().interrupt(); } } } -- 2.16.6