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 "Created Network Service Functions Features"
[controller.git]
/
opendaylight
/
md-sal
/
compatibility
/
flow-management-compatibility
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
md
/
frm
/
compatibility
/
FRMRuntimeDataProvider.java
diff --git
a/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FRMRuntimeDataProvider.java
b/opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FRMRuntimeDataProvider.java
index ff68176f1fed36f3b8c606421cee8790a73ec582..0653eeb2a63810d5b89e291facbb4c4f7e822e2f 100644
(file)
--- a/
opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FRMRuntimeDataProvider.java
+++ b/
opendaylight/md-sal/compatibility/flow-management-compatibility/src/main/java/org/opendaylight/controller/md/frm/compatibility/FRMRuntimeDataProvider.java
@@
-38,7
+38,7
@@
public class FRMRuntimeDataProvider implements RuntimeDataProvider, DataCommitHa
private DataProviderService dataService;
private IForwardingRulesManager manager;
private DataProviderService dataService;
private IForwardingRulesManager manager;
- public Registration
<DataCommitHandler<InstanceIdentifier<? extends DataObject>, DataObject>>
init() {
+ public Registration init() {
return this.dataService.registerCommitHandler(FRMRuntimeDataProvider.FLOWS_PATH, this);
}
return this.dataService.registerCommitHandler(FRMRuntimeDataProvider.FLOWS_PATH, this);
}