Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Made config/mdsal/netconf features non-cyclic
[controller.git]
/
opendaylight
/
forwardingrulesmanager
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
forwardingrulesmanager
/
FlowEntry.java
diff --git
a/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntry.java
b/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntry.java
index e86e0186c61544b73763ff2fa3edc877ce14c5f7..d9a0891c2ad812b855641c48155235633328ff51 100644
(file)
--- a/
opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntry.java
+++ b/
opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntry.java
@@
-122,7
+122,7
@@
public class FlowEntry implements Cloneable, Serializable {
}
if (flow == null) {
}
if (flow == null) {
- return
(other.flow == null) ? true : false
;
+ return
other.flow == null
;
} else if (other.flow == null) {
return false;
}
} else if (other.flow == null) {
return false;
}
@@
-168,14
+168,13
@@
public class FlowEntry implements Cloneable, Serializable {
public FlowEntry mergeWith(ContainerFlow containerFlow) {
Match myMatch = flow.getMatch();
public FlowEntry mergeWith(ContainerFlow containerFlow) {
Match myMatch = flow.getMatch();
- // Based on this flow direction, rearrange the match
- Match match = containerFlow.getMatch();
+ Match filter = containerFlow.getMatch();
// Merge
// Merge
-
myMatch.mergeWithFilter(match
);
+
Match merge = myMatch.mergeWithFilter(filter
);
// Replace this Flow's match with merged version
// Replace this Flow's match with merged version
- flow.setMatch(m
yMatch
);
+ flow.setMatch(m
erge
);
return this;
}
return this;
}
@@
-187,6
+186,7
@@
public class FlowEntry implements Cloneable, Serializable {
* @return true if internal generated static flow, false otherwise
*/
public boolean isInternal() {
* @return true if internal generated static flow, false otherwise
*/
public boolean isInternal() {
- return flowName.startsWith(FlowConfig.internalStaticFlowBegin);
+ return flowName.startsWith(FlowConfig.INTERNALSTATICFLOWBEGIN)
+ && flowName.endsWith(FlowConfig.INTERNALSTATICFLOWEND);
}
}
}
}