Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/drivers/impl/OFOpticalSwitchImplLINC13.java b/openflow/ctl/src/main/java/org/onlab/onos/openflow/drivers/impl/OFOpticalSwitchImplLINC13.java
index 0d28a50..3d8d93f 100644
--- a/openflow/ctl/src/main/java/org/onlab/onos/openflow/drivers/impl/OFOpticalSwitchImplLINC13.java
+++ b/openflow/ctl/src/main/java/org/onlab/onos/openflow/drivers/impl/OFOpticalSwitchImplLINC13.java
@@ -5,7 +5,6 @@
import org.onlab.onos.openflow.controller.driver.SwitchDriverSubHandshakeNotStarted;
import org.onlab.onos.openflow.controller.Dpid;
import org.onlab.onos.openflow.controller.driver.AbstractOpenFlowSwitch;
-import org.projectfloodlight.openflow.protocol.OFBarrierRequest;
import org.projectfloodlight.openflow.protocol.OFCircuitPortStatus;
import org.projectfloodlight.openflow.protocol.OFCircuitPortsReply;
import org.projectfloodlight.openflow.protocol.OFCircuitPortsRequest;
@@ -182,18 +181,6 @@
return Collections.unmodifiableList(portEntries);
}
- private void sendBarrier(boolean finalBarrier) throws IOException {
- int xid = getNextTransactionId();
- if (finalBarrier) {
- barrierXidToWaitFor = xid;
- }
- OFBarrierRequest br = factory()
- .buildBarrierRequest()
- .setXid(xid)
- .build();
- sendMsg(br);
- }
-
@Override
public void write(OFMessage msg) {
this.channel.write(Collections.singletonList(msg));