diff options
| author |   Wiktor Garbarek <wiktor.garbarek@nokia.com> | 2018-07-09 15:18:19 +0200 |
|---|---|---|
| committer | Wiktor Garbarek <wiktor.garbarek@nokia.com> | 2018-07-09 15:18:19 +0200 |
| commit | 29a772f710bd05bcf1a6a3da9af9b198bc003482 (patch) | |
| tree | efc470c4106b84fb52b3d487c9e2c283038e32b1 /champ-lib/champ-core | |
| parent | bce8bc8383c3f19b64b360a941ec1b1503791c85 (diff) | |
Fix handling of InterruptedException in AAI-Champ
Added thread interrupts
Change-Id: Ic5b7eef71354efd02736e88a1e6716aa84169898
Issue-ID: AAI-1367
Signed-off-by: Wiktor Garbarek <wiktor.garbarek@nokia.com>
Diffstat (limited to 'champ-lib/champ-core')
2 files changed, 6 insertions, 3 deletions
diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/event/AbstractLoggingChampGraph.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/event/AbstractLoggingChampGraph.java index 1f93a97..d920dbc 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/event/AbstractLoggingChampGraph.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/event/AbstractLoggingChampGraph.java @@ -398,7 +398,10 @@ public abstract class AbstractLoggingChampGraph implements ChampGraph { try { publisherPool.awaitTermination(1000, TimeUnit.MILLISECONDS); - } catch (InterruptedException e) {} + } catch (InterruptedException e) { + logger.warn("Termination interrupted"); + Thread.currentThread().interrupt(); + } } if(producer != null) { diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/TinkerpopTransaction.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/TinkerpopTransaction.java index f78abea..bd970dc 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/TinkerpopTransaction.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/TinkerpopTransaction.java @@ -108,7 +108,7 @@ public class TinkerpopTransaction extends ChampTransaction { } catch (InterruptedException ie) { LOGGER.info("Interrupted while backing off on transaction commit"); - Thread.interrupted(); + Thread.currentThread().interrupt(); return; } } @@ -153,7 +153,7 @@ public class TinkerpopTransaction extends ChampTransaction { } catch (InterruptedException ie) { LOGGER.info("Interrupted while backing off on transaction rollback"); - Thread.interrupted(); + Thread.currentThread().interrupt(); return; } } |