commit | 488a94c31e581329b0efb570161796ee0a07a57a | [log] [tgz] |
---|---|---|
author | Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> | Fri Jan 26 17:24:09 2018 -0800 |
committer | Ray Milkey <ray@opennetworking.org> | Mon Jan 29 21:12:15 2018 +0000 |
tree | 944b6f2dcf506324e2a2925ef3fa856c7d6b9c69 | |
parent | 96b896d04336010065b2d740bba8bd6a0187dbd2 [diff] |
more error-prone issue fix Change-Id: I49f2cc0459cfddddc6a99e2ebb8ad52d547e2909
diff --git a/apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java b/apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java index 8914a1e..0dc5dbe 100644 --- a/apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java +++ b/apps/route-service/app/src/main/java/org/onosproject/routeservice/impl/RouteManager.java
@@ -113,7 +113,9 @@ @Deactivate protected void deactivate() { routeMonitor.shutdown(); - listeners.values().forEach(ListenerQueue::stop); + synchronized (this) { + listeners.values().forEach(ListenerQueue::stop); + } routeStore.unsetDelegate(delegate); hostService.removeListener(hostListener); @@ -176,6 +178,7 @@ return routeSets.stream().flatMap(r -> r.routes().stream()).collect(Collectors.toList()); } + @Override public Collection<RouteTableId> getRouteTables() { return routeStore.getRouteTables(); }