From: Jozef Gloncak <jgloncak@cisco.com>
Date: Thu, 5 Mar 2015 12:55:18 +0000 (+0100)
Subject: BUG 2757 - repeating logging of warning.
X-Git-Tag: release/lithium~656
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c2e36c725def8c338393e57317391f19fc968739;p=openflowplugin.git

BUG 2757 - repeating logging of warning.

Fixes repeating logging of warnings - "flow hashing hit a duplicate for"

Change-Id: I810def7f5c181ac962a18ec1544d2c6b2257ed35
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
---

diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatListenCommitFlow.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatListenCommitFlow.java
index 9388a6bc14..7c612fcaea 100644
--- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatListenCommitFlow.java
+++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatListenCommitFlow.java
@@ -354,11 +354,12 @@ public class StatListenCommitFlow extends StatAbstractListenCommit<Flow, Openday
             while(it.hasNext()) {
                 final Flow cfgFlow = it.next();
                 final FlowKey cfgKey = cfgFlow.getKey();
-                if(flowIdByHash.inverse().containsKey(cfgKey)) {
-                    it.remove();
-                } else if(FlowComparator.flowEquals(flowStat, cfgFlow)) {
-                    it.remove();
-                    return cfgKey;
+                final FlowId cfgFlowId = cfgKey.getId();
+
+                if(! flowIdByHash.inverse().containsKey(cfgFlowId)) {
+                    if(FlowComparator.flowEquals(flowStat, cfgFlow)) {
+                        return cfgKey;
+                    }
                 }
             }
             return null;