Protect the RouteManagers threads from exceptions thrown by listeners

Change-Id: Ia260dcdcb83070939b96e4c7fb8d20baa0ae78a5

Protect the RouteManagers threads from exceptions thrown by listeners
Change-Id: Ia260dcdcb83070939b96e4c7fb8d20baa0ae78a5
Jonathan Hart · Gerrit Code Review
Commit f79ab48e2ef52219e52b6509a6a0fc86330e7517 f79ab48e 1 parent a1c41154
Showing 1 changed file with 7 additions and 4 deletions
incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteManager.java
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteManager.java
View file @f79ab48
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteManager.java
View file @f79ab48
@@ -279,12 +279,15 @@ public class RouteManager implements ListenerService<RouteEvent, RouteListener>,
         }
 
         private void poll() {
-             try {
-                 while (true) {
+             while (true) {
+                 try {
                     listener.event(queue.take());
+                 } catch (InterruptedException e) {
+                     log.info("Route listener event thread shutting down: {}", e.getMessage());
+                     break;
+                 } catch (Exception e) {
+                     log.warn("Exception during route event handler", e);
                 }
-             } catch (InterruptedException e) {
-                 log.info("Route listener event thread shutting down: {}", e.getMessage());
             }
         }