From: Anil Vishnoi <avishnoi@in.ibm.com>
Date: Sat, 25 Jan 2014 12:25:53 +0000 (+0530)
Subject: Minor fix in flow IP Matching
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-9^0
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=2d9dc00aaaa1a059dcca7861484698a95de0644e

Minor fix in flow IP Matching

Change-Id: I458425ec4482665a29b56012ec91610346eac378
Signed-off-by: Anil Vishnoi <avishnoi@in.ibm.com>
---

diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/MultipartMessageManager.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/MultipartMessageManager.java
index dfe356bdb1..6f58708e1b 100644
--- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/MultipartMessageManager.java
+++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/MultipartMessageManager.java
@@ -116,7 +116,8 @@ public class MultipartMessageManager {
     }
     
     public void setTxIdAndTableIdMapEntry(NodeId nodeId, TransactionId id,Short tableId){
-        
+        if(id == null)
+            return;
         txIdTotableIdMap.put(new TxIdEntry(nodeId,id,null), tableId);
     }
     
@@ -129,6 +130,8 @@ public class MultipartMessageManager {
         }
     }
     public void addTxIdToRequestTypeEntry (NodeId nodeId, TransactionId id,StatsRequestType type){
+        if(id == null)
+            return;
         TxIdEntry entry = new TxIdEntry(nodeId,id,type);
         txIdToRequestTypeMap.put(entry, getExpiryTime());
     }
diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java
index 07dcd0f6aa..d14f7cf503 100644
--- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java
+++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java
@@ -688,13 +688,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
         if (statsFlow.getClass() != storedFlow.getClass()) {
             return false;
         }
-        if (statsFlow.getBufferId()== null) {
-            if (storedFlow.getBufferId() != null) {
-                return false;
-            }
-        } else if(!statsFlow.getBufferId().equals(storedFlow.getBufferId())) {
-            return false;
-        }
         if (statsFlow.getContainerName()== null) {
             if (storedFlow.getContainerName()!= null) {
                 return false;
@@ -702,13 +695,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
         } else if(!statsFlow.getContainerName().equals(storedFlow.getContainerName())) {
             return false;
         }
-        if (statsFlow.getCookie()== null) {
-            if (storedFlow.getCookie()!= null) {
-                return false;
-            }
-        } else if(!statsFlow.getCookie().equals(storedFlow.getCookie())) {
-            return false;
-        }
         if (statsFlow.getMatch()== null) {
             if (storedFlow.getMatch() != null) {
                 return false;
@@ -717,20 +703,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
         else if(!matchEquals(statsFlow.getMatch(), storedFlow.getMatch())) {
             return false;
         }
-        if (statsFlow.getHardTimeout() == null) {
-            if (storedFlow.getHardTimeout() != null) {
-                return false;
-            }
-        } else if(!statsFlow.getHardTimeout().equals(storedFlow.getHardTimeout() )) {
-            return false;
-        }
-        if (statsFlow.getIdleTimeout()== null) {
-            if (storedFlow.getIdleTimeout() != null) {
-                return false;
-            }
-        } else if(!statsFlow.getIdleTimeout().equals(storedFlow.getIdleTimeout())) {
-            return false;
-        }
         if (statsFlow.getPriority() == null) {
             if (storedFlow.getPriority() != null) {
                 return false;