diff options
| author |   Tian Lee <TianL@amdocs.com> | 2018-07-11 12:59:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-07-11 12:59:43 +0000 |
| commit | ea4e3c6813fce52a4cd6a4da16aa6146d287505a (patch) | |
| tree | 9c2c147330d9cf6b8e8cac7e93465cc1e2112f7a /champ-lib/champ-core | |
| parent | ac1830e63f1e93714f5bc8eef4239652a018070f (diff) | |
| parent | 29a772f710bd05bcf1a6a3da9af9b198bc003482 (diff) | |
Merge "Fix handling of InterruptedException in AAI-Champ"
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 52ad560..f13d585 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 @@ -392,7 +392,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; } } |