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 possible NPE if Bundle is stopped."
[controller.git]
/
opendaylight
/
md-sal
/
statistics-manager
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
md
/
statistics
/
manager
/
FlowComparator.java
diff --git
a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/FlowComparator.java
b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/FlowComparator.java
index cd9738c894554a8e609eac1acb4b9fbd9534eac9..2b67edfd9d318d29cbd3508c17a1e8bafd9f4a70 100644
(file)
--- a/
opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/FlowComparator.java
+++ b/
opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/FlowComparator.java
@@
-35,9
+35,6
@@
final class FlowComparator {
if (statsFlow == null || storedFlow == null) {
return false;
}
if (statsFlow == null || storedFlow == null) {
return false;
}
- if (statsFlow.getClass() != storedFlow.getClass()) {
- return false;
- }
if (statsFlow.getContainerName()== null) {
if (storedFlow.getContainerName()!= null) {
return false;
if (statsFlow.getContainerName()== null) {
if (storedFlow.getContainerName()!= null) {
return false;
@@
-99,9
+96,6
@@
final class FlowComparator {
}
if (storedFlow == null && statsFlow != null) return false;
if (statsFlow == null && storedFlow != null) return false;
}
if (storedFlow == null && statsFlow != null) return false;
if (statsFlow == null && storedFlow != null) return false;
- if (storedFlow.getClass() != statsFlow.getClass()) {
- return false;
- }
if (storedFlow.getEthernetMatch() == null) {
if (statsFlow.getEthernetMatch() != null) {
return false;
if (storedFlow.getEthernetMatch() == null) {
if (statsFlow.getEthernetMatch() != null) {
return false;