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 "Parents pom distribution"
[controller.git]
/
opendaylight
/
protocol_plugins
/
openflow
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
protocol_plugin
/
openflow
/
internal
/
FlowProgrammerNotifier.java
diff --git
a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerNotifier.java
b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerNotifier.java
index 594164ddcf800948197df5a9fc87159c84a03d1f..2a62d6c34a08a19c4cccb898acdf90945ada255b 100644
(file)
--- a/
opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerNotifier.java
+++ b/
opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerNotifier.java
@@
-37,7
+37,7
@@
public class FlowProgrammerNotifier implements IFlowProgrammerNotifier {
* Function called by the dependency manager when at least one dependency
* become unsatisfied or when the component is shutting down because for
* example bundle is being stopped.
* Function called by the dependency manager when at least one dependency
* become unsatisfied or when the component is shutting down because for
* example bundle is being stopped.
- *
+ *
*/
void destroy() {
logger.debug("DESTROY called!");
*/
void destroy() {
logger.debug("DESTROY called!");
@@
-46,7
+46,7
@@
public class FlowProgrammerNotifier implements IFlowProgrammerNotifier {
/**
* Function called by dependency manager after "init ()" is called and after
* the services provided by the class are registered in the service registry
/**
* Function called by dependency manager after "init ()" is called and after
* the services provided by the class are registered in the service registry
- *
+ *
*/
void start() {
logger.debug("START called!");
*/
void start() {
logger.debug("START called!");
@@
-56,7
+56,7
@@
public class FlowProgrammerNotifier implements IFlowProgrammerNotifier {
* Function called by the dependency manager before the services exported by
* the component are unregistered, this will be followed by a "destroy ()"
* calls
* Function called by the dependency manager before the services exported by
* the component are unregistered, this will be followed by a "destroy ()"
* calls
- *
+ *
*/
void stop() {
logger.debug("STOP called!");
*/
void stop() {
logger.debug("STOP called!");
@@
-83,4
+83,13
@@
public class FlowProgrammerNotifier implements IFlowProgrammerNotifier {
}
}
}
}
+ @Override
+ public void flowErrorReported(Node node, long rid, Object err) {
+ if (salNotifier != null) {
+ salNotifier.flowErrorReported(node, rid, err);
+ } else {
+ logger.warn("Unable to relay switch error message to upper layer");
+ }
+ }
+
}
}