SONAR suggestion - proper handling of InterruptedException
Change-Id: I67a93c064708c207d9ce83fac319682c2d17db60
diff --git a/protocols/grpc/ctl/src/main/java/org/onosproject/grpc/ctl/GrpcControllerImpl.java b/protocols/grpc/ctl/src/main/java/org/onosproject/grpc/ctl/GrpcControllerImpl.java
index bbcd99f..6f233c8 100644
--- a/protocols/grpc/ctl/src/main/java/org/onosproject/grpc/ctl/GrpcControllerImpl.java
+++ b/protocols/grpc/ctl/src/main/java/org/onosproject/grpc/ctl/GrpcControllerImpl.java
@@ -171,6 +171,7 @@
} catch (InterruptedException e) {
log.warn("Channel {} didn't shut down in time.");
channel.shutdownNow();
+ Thread.currentThread().interrupt();
}
channels.remove(channelId);
diff --git a/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/lsdb/LsdbAgeImpl.java b/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/lsdb/LsdbAgeImpl.java
index 794d623..ea10996 100644
--- a/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/lsdb/LsdbAgeImpl.java
+++ b/protocols/ospf/ctl/src/main/java/org/onosproject/ospf/controller/lsdb/LsdbAgeImpl.java
@@ -197,6 +197,7 @@
//remove from bin
lsaBin.removeOspfLsa((String) key, lsa);
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
log.debug("Error::LSDBAge::maxAgeLsa::{}", e.getMessage());
}
}
@@ -215,6 +216,7 @@
//remove from bin
maxAgeBin.removeOspfLsa((String) key, lsa);
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
log.debug("Error::LSDBAge::maxAgeLsa::{}", e.getMessage());
}
}
@@ -249,6 +251,7 @@
lsaBin.removeOspfLsa((String) key, lsa);
}
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
log.debug("Error::LSDBAge::refreshLsa::{}", e.getMessage());
}
}
@@ -272,6 +275,7 @@
try {
lsaQueue.put(lsa);
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
log.debug("Error::LSDBAge::checkAges::{}", e.getMessage());
}
}
diff --git a/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeClientImpl.java b/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeClientImpl.java
index 534ef06..905a690 100644
--- a/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeClientImpl.java
+++ b/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeClientImpl.java
@@ -774,6 +774,7 @@
executorService.awaitTermination(5, TimeUnit.SECONDS);
} catch (InterruptedException e) {
log.warn("Executor service didn't shutdown in time.");
+ Thread.currentThread().interrupt();
}
} finally {
writeLock.unlock();