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 "Made config/mdsal/netconf features non-cyclic"
[controller.git]
/
opendaylight
/
forwardingrulesmanager
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
forwardingrulesmanager
/
FlowEntryInstall.java
diff --git
a/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntryInstall.java
b/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntryInstall.java
index ebb5a7bb2457125d8c3c27ea795a820377354eef..1318c97ce22e40016fb113a4d1c46d524eba7c1b 100644
(file)
--- a/
opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntryInstall.java
+++ b/
opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowEntryInstall.java
@@
-28,13
+28,13
@@
public class FlowEntryInstall implements Serializable {
private final FlowEntry original;
private final ContainerFlow cFlow;
private final FlowEntry install;
private final FlowEntry original;
private final ContainerFlow cFlow;
private final FlowEntry install;
-
transient private
long requestId; // async request id
-
transient private
boolean deletePending;
+
private transient
long requestId; // async request id
+
private transient
boolean deletePending;
public FlowEntryInstall(FlowEntry original, ContainerFlow cFlow) {
this.original = original;
this.cFlow = cFlow;
public FlowEntryInstall(FlowEntry original, ContainerFlow cFlow) {
this.original = original;
this.cFlow = cFlow;
- this.install = (cFlow == null) ? original.clone() : original.mergeWith(cFlow);
+ this.install = (cFlow == null) ? original.clone() : original.
clone().
mergeWith(cFlow);
deletePending = false;
requestId = 0;
}
deletePending = false;
requestId = 0;
}