commit cef45550bc904da88db9f9e8acb4e5eacf832b03
author Marc De Leenheer <marc@onlab.us> Mon Dec 14 19:59:59 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Dec 17 22:30:36 2015 +0000
tree e467839542a75acd3388844bf4875cad304e8374
parent 1b1537cc6f18459020c640db0299ee9e67bb9509

Harmonize resource collectors.

Change-Id: I51fdf9cdf57d3146bd9401ff67e13063830519e4

core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java

diff --git a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java
index ae60d50..9df5f50 100644
--- a/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java
+++ b/core/net/src/main/java/org/onosproject/net/newresource/impl/ResourceDeviceListener.java
@@ -45,9 +45,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.SortedSet;
-import java.util.TreeSet;
 import java.util.concurrent.ExecutorService;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -206,10 +204,9 @@
             }
             LambdaQuery query = handler.behaviour(LambdaQuery.class);
             if (query != null) {
-                Supplier<SortedSet<OchSignal>> supplier = () -> new TreeSet<>(new DefaultOchSignalComparator());
                 return query.queryLambdas(port).stream()
                         .flatMap(x -> OchSignal.toFlexGrid(x).stream())
-                        .collect(Collectors.toCollection(supplier));
+                        .collect(Collectors.toCollection(DefaultOchSignalComparator::newOchSignalTreeSet));
             } else {
                 return Collections.emptySortedSet();
             }