Commit 94b1155e authored by Guus der Kinderen's avatar Guus der Kinderen

Merge pull request #260 from tevans/OF-903

OF-903: Simplify backup packet delivery
parents 5e3f4161 477aee88
......@@ -312,15 +312,7 @@ public class NIOConnection implements Connection {
public void deliver(Packet packet) throws UnauthorizedException {
if (state != State.RUNNING) {
// OF-857: Do not allow the backup deliverer to recurse
if (backupDeliverer == null) {
Log.error("Failed to deliver packet: " + packet.toXML());
throw new IllegalStateException("Connection closed");
}
// attempt to deliver via backup only once
PacketDeliverer backup = backupDeliverer;
backupDeliverer = null;
backup.deliver(packet);
backupDeliverer.deliver(packet);
}
else {
boolean errorDelivering = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment