summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/cluster/Connection.cpp
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-02-04 20:47:14 +0000
committerAlan Conway <aconway@apache.org>2009-02-04 20:47:14 +0000
commit5b50014477ef0b9096c017af8fb85ac5693e673e (patch)
treef4188e6b16cd304e76e2326aca2f13f1d32fc368 /cpp/src/qpid/cluster/Connection.cpp
parentf847d041bc6bf18246bddeff2a219dcbdfa9620c (diff)
downloadqpid-python-5b50014477ef0b9096c017af8fb85ac5693e673e.tar.gz
Fix assertion due to doOutput control being sent after local connection closed.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@740872 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/Connection.cpp')
-rw-r--r--cpp/src/qpid/cluster/Connection.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/qpid/cluster/Connection.cpp b/cpp/src/qpid/cluster/Connection.cpp
index a71950ef1d..2a831ae435 100644
--- a/cpp/src/qpid/cluster/Connection.cpp
+++ b/cpp/src/qpid/cluster/Connection.cpp
@@ -112,7 +112,7 @@ void Connection::received(framing::AMQFrame& f) {
cluster.addShadowConnection(this);
AMQFrame ok((ConnectionCloseOkBody()));
connection.getOutput().send(ok);
- output.setOutputHandler(discardHandler);
+ output.closeOutput(discardHandler);
catchUp = false;
}
else
@@ -165,7 +165,7 @@ void Connection::closed() {
// This was a local replicated connection. Multicast a deliver
// closed and process any outstanding frames from the cluster
// until self-delivery of deliver-close.
- output.setOutputHandler(discardHandler);
+ output.closeOutput(discardHandler);
cluster.getMulticast().mcastControl(ClusterConnectionDeliverCloseBody(), self);
}
}