From 9560b7d54ec4411f0605a3b53997835599f70ea2 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Mon, 10 Sep 2012 08:47:58 +0200 Subject: Fixed communicator flushBatchRequests to allow tracing --- cpp/src/Ice/Outgoing.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'cpp/src/Ice/Outgoing.cpp') diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp index 23fc92af5df..565a954f691 100644 --- a/cpp/src/Ice/Outgoing.cpp +++ b/cpp/src/Ice/Outgoing.cpp @@ -547,19 +547,21 @@ IceInternal::Outgoing::throwUserException() } } -IceInternal::BatchOutgoing::BatchOutgoing(RequestHandler* handler) : +IceInternal::BatchOutgoing::BatchOutgoing(RequestHandler* handler, InvocationObserver& observer) : _handler(handler), _connection(0), _sent(false), - _os(handler->getReference()->getInstance().get(), Ice::currentProtocolEncoding) + _os(handler->getReference()->getInstance().get(), Ice::currentProtocolEncoding), + _observer(observer) { } -IceInternal::BatchOutgoing::BatchOutgoing(ConnectionI* connection, Instance* instance) : +IceInternal::BatchOutgoing::BatchOutgoing(ConnectionI* connection, Instance* instance, InvocationObserver& observer) : _handler(0), _connection(connection), _sent(false), - _os(instance, Ice::currentProtocolEncoding) + _os(instance, Ice::currentProtocolEncoding), + _observer(observer) { } @@ -574,7 +576,7 @@ IceInternal::BatchOutgoing::invoke() { _monitor.wait(); } - + _remoteObserver.detach(); if(_exception.get()) { _exception->ice_throw(); -- cgit v1.2.3