Merge "CHange log level from warn to debug in ProtocolSessionPromise when connection...

[controller.git] / opendaylight / statisticsmanager / implementation / src / main / java / org / opendaylight / controller / statisticsmanager / internal / StatisticsManager.java

diff --git a/opendaylight/statisticsmanager/implementation/src/main/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManager.java b/opendaylight/statisticsmanager/implementation/src/main/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManager.java
index 92ed44efbbde51e80046048f3d4afe9e1a4de56f..2376b8752f1e5d675277024cb98cdc4c25a77b0c 100644 (file)
--- a/opendaylight/statisticsmanager/implementation/src/main/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManager.java
+++ b/opendaylight/statisticsmanager/implementation/src/main/java/org/opendaylight/controller/statisticsmanager/internal/StatisticsManager.java
@@ -101,7 +101,6 @@ public class StatisticsManager implements IStatisticsManager, IReadServiceListen
         triggers = new ConcurrentHashMap<Integer, Node>();
     }
 
-    @SuppressWarnings("deprecation")
     private void allocateCaches() {
         if (clusterContainerService == null) {
             nonClusterObjectCreate();
@@ -126,7 +125,7 @@ public class StatisticsManager implements IStatisticsManager, IReadServiceListen
             log.debug("Skipping statistics cache creation - already present");
         }
     }
-    @SuppressWarnings({ "unchecked", "deprecation" })
+    @SuppressWarnings({ "unchecked" })
     private void retrieveCaches() {
         ConcurrentMap<?, ?> map;
 
@@ -315,9 +314,9 @@ public class StatisticsManager implements IStatisticsManager, IReadServiceListen
             try {
                 boolean retStatus;
                 if(oldLatch != null) {
-                    retStatus = oldLatch.await(this.latchTimeout, TimeUnit.SECONDS);
+                    retStatus = oldLatch.await(StatisticsManager.latchTimeout, TimeUnit.SECONDS);
                 } else {
-                    retStatus = newLatch.await(this.latchTimeout, TimeUnit.SECONDS);
+                    retStatus = newLatch.await(StatisticsManager.latchTimeout, TimeUnit.SECONDS);
                 }
                 // log the return code as it will give us, if
                 // the latch timed out.
@@ -426,7 +425,7 @@ public class StatisticsManager implements IStatisticsManager, IReadServiceListen
     @Override
     public List<NodeConnectorStatistics> getNodeConnectorStatistics(Node node) {
         if (node == null){
-            return null;
+            return Collections.emptyList();
         }
 
         List<NodeConnectorStatistics> statList = new ArrayList<NodeConnectorStatistics>();
@@ -456,7 +455,7 @@ public class StatisticsManager implements IStatisticsManager, IReadServiceListen
     @Override
     public List<NodeTableStatistics> getNodeTableStatistics(Node node){
         if (node == null){
-            return null;
+            return Collections.emptyList();
         }
         List<NodeTableStatistics> statList = new ArrayList<NodeTableStatistics>();
         List<NodeTableStatistics> cachedList = tableStatistics.get(node);
@@ -468,11 +467,8 @@ public class StatisticsManager implements IStatisticsManager, IReadServiceListen
 
     @Override
     public void nodeFlowStatisticsUpdated(Node node, List<FlowOnNode> flowStatsList) {
-        List<FlowOnNode> currentStat = this.flowStatistics.get(node);
-        // Update cache only if changed to avoid unnecessary cache sync operations
-        if (! flowStatsList.equals(currentStat)){
-            this.flowStatistics.put(node, flowStatsList);
-        }
+        // No equality check because duration fields change constantly
+        this.flowStatistics.put(node, flowStatsList);
     }
 
     @Override