summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2008-04-01 16:32:10 +0000
committerGordon Sim <gsim@apache.org>2008-04-01 16:32:10 +0000
commit0b8344c3212bf98feb4ecb869d1d9436d227ebfc (patch)
tree899b5beacac924d90db87f38c4994e22a73b1399 /cpp/src
parent39d5ad08610bd28822c77807c1a74a9d2c0be25a (diff)
downloadqpid-python-0b8344c3212bf98feb4ecb869d1d9436d227ebfc.tar.gz
Fix some erroneous definitions in the transitional xml fragment for 0-10.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@643472 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/broker/ConnectionHandler.cpp4
-rw-r--r--cpp/src/qpid/broker/ConnectionHandler.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/ConnectionHandler.cpp b/cpp/src/qpid/broker/ConnectionHandler.cpp
index f28c2bb7f7..b763969948 100644
--- a/cpp/src/qpid/broker/ConnectionHandler.cpp
+++ b/cpp/src/qpid/broker/ConnectionHandler.cpp
@@ -96,13 +96,13 @@ void ConnectionHandler::Handler::startOk(const framing::FieldTable& /*clientProp
connection.setUserId(uid);
}
}
- client.tune(framing::CHANNEL_MAX, connection.getFrameMax(), connection.getHeartbeat());
+ client.tune(framing::CHANNEL_MAX, connection.getFrameMax(), 0, 0);
}
void ConnectionHandler::Handler::secureOk(const string& /*response*/){}
void ConnectionHandler::Handler::tuneOk(uint16_t /*channelmax*/,
- uint32_t framemax, uint16_t heartbeat)
+ uint16_t framemax, uint16_t heartbeat)
{
connection.setFrameMax(framemax);
connection.setHeartbeat(heartbeat);
diff --git a/cpp/src/qpid/broker/ConnectionHandler.h b/cpp/src/qpid/broker/ConnectionHandler.h
index 56de1c7517..d949d51c43 100644
--- a/cpp/src/qpid/broker/ConnectionHandler.h
+++ b/cpp/src/qpid/broker/ConnectionHandler.h
@@ -53,7 +53,7 @@ class ConnectionHandler : public framing::FrameHandler
const std::string& mechanism, const std::string& response,
const std::string& locale);
void secureOk(const std::string& response);
- void tuneOk(uint16_t channelMax, uint32_t frameMax, uint16_t heartbeat);
+ void tuneOk(uint16_t channelMax, uint16_t frameMax, uint16_t heartbeat);
void heartbeat() {}
void open(const std::string& virtualHost,
const framing::Array& capabilities, bool insist);