commit a7a0f560a28d694aecc790f9c96923d9a93f5f69
author Thomas Vachuska <tom@onlab.us> Tue Apr 14 23:27:44 2015 -0700
committer Thomas Vachuska <tom@onlab.us> Thu Apr 16 14:04:35 2015 -0700
tree 42feb5d5bba7de4f42d38976cf8598094586352d
parent fcbde8919da62dae90fd941e18436868041df460

Converting builtin applications to be delivered in a self-contained manner via OAR files.

Change-Id: I5b7c6939aacc263248868fac2e0f69124c5f3609

providers/null/src/main/java/org/onosproject/provider/nil/NullPacketProvider.java

diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/NullPacketProvider.java b/providers/null/src/main/java/org/onosproject/provider/nil/NullPacketProvider.java
index a1baec9..674b33f 100644
--- a/providers/null/src/main/java/org/onosproject/provider/nil/NullPacketProvider.java
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/NullPacketProvider.java
@@ -136,8 +136,8 @@
 
         @Override
         public void run(Timeout to) {
-            if (!devices.isEmpty()) {
-                sendEvent(devices.get(currentDevice));
+            if (!devices.isEmpty() && !to.isCancelled()) {
+                sendEvent(devices.get(Math.max(currentDevice, devices.size())));
                 currentDevice = (currentDevice + 1) % devices.size();
                 timeout = timer.newTimeout(to.getTask(), delay, TimeUnit.MILLISECONDS);
             }