| commit | 09f88b856d9df00a6927233909c1545dec1cf896 | [log] [tgz] |
|---|---|---|
| author | Pier Ventre <pierventre@hotmail.com> | Mon Jan 09 23:01:05 2017 -0800 |
| committer | Ray Milkey <ray@onlab.us> | Sat Jan 21 00:17:18 2017 +0000 |
| tree | e805643686eb3d3e084be4a95cbaedcfa03851cc | |
| parent | 968da123807771eebdc6b3911afa50cd3ddba269 [diff] |
Removes leftovers of the previous patches. Change-Id: Id1131762e94141eab472ff4a31035acc28979d43
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java index 76a46f0..55562e0 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java +++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
@@ -455,7 +455,6 @@ srManager.interfaceService.getInterfacesByPort(connectPoint).stream() .flatMap(intf -> intf.ipAddressesList().stream()) .map(InterfaceIpAddress::subnetAddress) - .map(IpPrefix::getIp4Prefix) .collect(Collectors.toSet()); if (subnets.isEmpty()) { @@ -595,7 +594,6 @@ return null; } - /** * Checks if the host is in the subnet defined in the router with the * device ID given.
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManager.java index 09676b1..105a1323 100644 --- a/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManager.java +++ b/incubator/net/src/main/java/org/onosproject/incubator/net/neighbour/impl/NeighbourResolutionManager.java
@@ -240,7 +240,7 @@ private void register(ConnectPoint connectPoint, HandlerRegistration registration) { synchronized (packetHandlers) { - if (packetHandlers.isEmpty()) { + if (packetHandlers.isEmpty() && requestInterceptsEnabled) { requestPackets(); } packetHandlers.put(connectPoint, registration);