commit eba4e3407f1b1863661921a2d629f868d1cf62fc
author Brian O'Connor <bocon@onlab.us> Thu Apr 30 22:50:13 2015 -0700
committer Brian O'Connor <bocon@onlab.us> Fri May 01 12:48:16 2015 -0700
tree 6624e4aef13e7e8cfe1dc09b0b26341f686132d1
parent cdec493d804d83404370f3d0d1560b5f5da8f0dd

Adding tests for IntentCleaner

Also, two small bug fixes for SimpleIntentStore
and one for IntentCleanup

Change-Id: I19c8246dd669d894ba258e04f4f963a97b9a7626

core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIntentStore.java

diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIntentStore.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIntentStore.java
index 72a5dce..629cde3 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIntentStore.java
+++ b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIntentStore.java
@@ -80,11 +80,10 @@
         if (localOnly || olderThan > 0) {
             long older = System.nanoTime() - olderThan * 1_000_000; //convert ms to ns
             final SystemClockTimestamp time = new SystemClockTimestamp(older);
-            return pending.values().stream()
+            return current.values().stream()
                     .filter(data -> data.version().isOlderThan(time) &&
                             (!localOnly || isMaster(data.key())))
                     .collect(Collectors.toList());
-
         }
         return Lists.newArrayList(current.values());
     }
@@ -174,7 +173,7 @@
                     existingData.version().compareTo(data.version()) < 0) {
                 pending.put(data.key(), data);
                 checkNotNull(delegate, "Store delegate is not set")
-                        .process(data);
+                        .process(new IntentData(data));
                 notifyDelegateIfNotNull(IntentEvent.getEvent(data));
             } else {
                 log.debug("IntentData {} is older than existing: {}",