summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectRequestHandler.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2008-05-27 20:21:02 +0200
committerBenoit Foucher <benoit@zeroc.com>2008-06-06 12:25:26 +0200
commitf92077c67c4d9329aba9f2455987d3d8ca632d17 (patch)
treed90aff63280048176b5fd561df2d6a06d63fe463 /cpp/src/Ice/ConnectRequestHandler.cpp
parentFixed bug 3225 - Uninitialized attribute (diff)
downloadice-f92077c67c4d9329aba9f2455987d3d8ca632d17.tar.bz2
ice-f92077c67c4d9329aba9f2455987d3d8ca632d17.tar.xz
ice-f92077c67c4d9329aba9f2455987d3d8ca632d17.zip
- Fixed bug where first proxy request could incorrectly be sent compress or uncompressed.
- Added support to run the tests with valgrind on Linux (tested with valgrind 3.3.0).
Diffstat (limited to 'cpp/src/Ice/ConnectRequestHandler.cpp')
-rw-r--r--cpp/src/Ice/ConnectRequestHandler.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp
index e03774551dd..8c93f22cde9 100644
--- a/cpp/src/Ice/ConnectRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectRequestHandler.cpp
@@ -212,7 +212,10 @@ ConnectRequestHandler::abortBatchRequest()
Ice::ConnectionI*
ConnectRequestHandler::sendRequest(Outgoing* out)
{
- if(!getConnection(true)->sendRequest(out, _compress, _response) || _response)
+ // Must be called first, _compress might not be initialized before this returns.
+ Ice::ConnectionIPtr connection = getConnection(true);
+ assert(connection);
+ if(!connection->sendRequest(out, _compress, _response) || _response)
{
return _connection.get(); // The request has been sent or we're expecting a response.
}