Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix for bug #236 and bug #240 Have made changes in opendaylight-table-types...
[controller.git]
/
opendaylight
/
md-sal
/
statistics-manager
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
md
/
statistics
/
manager
/
MultipartMessageManager.java
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 dfe356bdb1efbbc5ec7d299025b6cf879d820b38..6f58708e1b207edf898f606448147119ec3e106b 100644
(file)
--- 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){
}
public void setTxIdAndTableIdMapEntry(NodeId nodeId, TransactionId id,Short tableId){
-
+ if(id == null)
+ return;
txIdTotableIdMap.put(new TxIdEntry(nodeId,id,null), tableId);
}
txIdTotableIdMap.put(new TxIdEntry(nodeId,id,null), tableId);
}
@@
-129,6
+130,8
@@
public class MultipartMessageManager {
}
}
public void addTxIdToRequestTypeEntry (NodeId nodeId, TransactionId id,StatsRequestType type){
}
}
public void addTxIdToRequestTypeEntry (NodeId nodeId, TransactionId id,StatsRequestType type){
+ if(id == null)
+ return;
TxIdEntry entry = new TxIdEntry(nodeId,id,type);
txIdToRequestTypeMap.put(entry, getExpiryTime());
}
TxIdEntry entry = new TxIdEntry(nodeId,id,type);
txIdToRequestTypeMap.put(entry, getExpiryTime());
}