From 9642fb7d1908d980fb27986d65a4a28daa3c08ab Mon Sep 17 00:00:00 2001
From: kwanggithub <kwang@clemson.edu>
Date: Fri, 15 Feb 2013 16:59:59 -0800
Subject: [PATCH] Revert consolidation changes to write() methods
---
.../core/OFSwitchBase.java | 47 +++++++++----------
1 file changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/core/OFSwitchBase.java b/src/main/java/net/floodlightcontroller/core/OFSwitchBase.java
index 46351f299..17bbcf07e 100644
--- a/src/main/java/net/floodlightcontroller/core/OFSwitchBase.java
+++ b/src/main/java/net/floodlightcontroller/core/OFSwitchBase.java
@@ -186,12 +186,6 @@ public abstract class OFSwitchBase implements IOFSwitch {
}
@Override
- @LogMessageDoc(level="WARN",
- message="Sending OF message that modifies switch " +
- "state while in the slave role: {switch}",
- explanation="An application has sent a message to a switch " +
- "that is not valid when the switch is in a slave role",
- recommendation=LogMessageDoc.REPORT_CONTROLLER_BUG)
public void write(OFMessage m, FloodlightContext bc)
throws IOException {
Map<IOFSwitch,List<OFMessage>> msg_buffer_map = local_msg_buffer.get();
@@ -201,20 +195,6 @@ public abstract class OFSwitchBase implements IOFSwitch {
msg_buffer_map.put(this, msg_buffer);
}
- if (role == Role.SLAVE) {
- switch (m.getType()) {
- case PACKET_OUT:
- case FLOW_MOD:
- case PORT_MOD:
- log.warn("Sending OF message that modifies switch " +
- "state while in the slave role: {}",
- m.getType().name());
- break;
- default:
- break;
- }
- }
-
this.floodlightProvider.handleOutgoingMessage(this, m, bc);
msg_buffer.add(m);
@@ -226,12 +206,31 @@ public abstract class OFSwitchBase implements IOFSwitch {
}
@Override
+ @LogMessageDoc(level="WARN",
+ message="Sending OF message that modifies switch " +
+ "state while in the slave role: {switch}",
+ explanation="An application has sent a message to a switch " +
+ "that is not valid when the switch is in a slave role",
+ recommendation=LogMessageDoc.REPORT_CONTROLLER_BUG)
public void write(List<OFMessage> msglist,
FloodlightContext bc) throws IOException {
- for (OFMessage m : msglist)
- this.write(m, bc);
-
- flush ();
+ for (OFMessage m : msglist) {
+ if (role == Role.SLAVE) {
+ switch (m.getType()) {
+ case PACKET_OUT:
+ case FLOW_MOD:
+ case PORT_MOD:
+ log.warn("Sending OF message that modifies switch " +
+ "state while in the slave role: {}",
+ m.getType().name());
+ break;
+ default:
+ break;
+ }
+ }
+ this.floodlightProvider.handleOutgoingMessage(this, m, bc);
+ }
+ this.write(msglist);
}
private void write(List<OFMessage> msglist) throws IOException {
--
GitLab