commit c19d8291fdeca93be8b00794b342349ad566b9d1
author Thomas Vachuska <tom@onlab.us> Mon Jul 06 14:11:34 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Jul 06 21:45:33 2015 +0000
tree c02a7a773363f7707ab15e67c3f69aa510d8605e
parent af734ff4c7d6d108c1dce103d17f8e7e6a53072e

Ooops... missed a few comments when merging Aaron's change. Sorry about that.

Change-Id: I9a4e2aac928b276f38777deeb144f80e68ff5fca

apps/reactive-routing/src/main/java/org/onosproject/reactive/routing/SdnIpReactiveRouting.java

diff --git a/apps/reactive-routing/src/main/java/org/onosproject/reactive/routing/SdnIpReactiveRouting.java b/apps/reactive-routing/src/main/java/org/onosproject/reactive/routing/SdnIpReactiveRouting.java
index fedfbbb..e818b41 100644
--- a/apps/reactive-routing/src/main/java/org/onosproject/reactive/routing/SdnIpReactiveRouting.java
+++ b/apps/reactive-routing/src/main/java/org/onosproject/reactive/routing/SdnIpReactiveRouting.java
@@ -84,8 +84,7 @@
     @Activate
     public void activate() {
         appId = coreService.registerApplication(APP_NAME);
-        packetService.addProcessor(processor,
-                                   PacketProcessor.ADVISOR_MAX + 2);
+        packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 2);
         requestIntercepts();
         log.info("SDN-IP Reactive Routing Started");
     }
@@ -105,11 +104,9 @@
         //TODO: to support IPv6 later
         TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
         selector.matchEthType(TYPE_IPV4);
-        packetService.requestPackets(selector.build(),
-                                     REACTIVE, appId);
+        packetService.requestPackets(selector.build(), REACTIVE, appId);
         selector.matchEthType(TYPE_ARP);
-        packetService.requestPackets(selector.build(),
-                                     REACTIVE, appId);
+        packetService.requestPackets(selector.build(), REACTIVE, appId);
     }
 
     /**
@@ -118,12 +115,10 @@
     private void withdrawIntercepts() {
         TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
         selector.matchEthType(TYPE_IPV4);
-        packetService.requestPackets(selector.build(),
-                                     REACTIVE, appId);
+        packetService.cancelPackets(selector.build(), REACTIVE, appId);
         selector = DefaultTrafficSelector.builder();
         selector.matchEthType(TYPE_ARP);
-        packetService.requestPackets(selector.build(),
-                                     REACTIVE, appId);
+        packetService.cancelPackets(selector.build(), REACTIVE, appId);
     }
 
     private class ReactiveRoutingProcessor implements PacketProcessor {