summaryrefslogtreecommitdiff
path: root/cppe/src
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2006-03-20 17:26:32 +0000
committerDwayne Boone <dwayne@zeroc.com>2006-03-20 17:26:32 +0000
commitece547d12646753b06599064b3afd673bb46e1a7 (patch)
tree04baf10ddc3f715c979c7ec5ec76b8aa878f6be7 /cppe/src
parentFixed bug 908 (diff)
downloadice-ece547d12646753b06599064b3afd673bb46e1a7.tar.bz2
ice-ece547d12646753b06599064b3afd673bb46e1a7.tar.xz
ice-ece547d12646753b06599064b3afd673bb46e1a7.zip
Added requestId to Current.
Diffstat (limited to 'cppe/src')
-rwxr-xr-xcppe/src/IceE/Connection.cpp2
-rw-r--r--cppe/src/IceE/Incoming.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/cppe/src/IceE/Connection.cpp b/cppe/src/IceE/Connection.cpp
index 6a4a89de712..84f87a030cc 100755
--- a/cppe/src/IceE/Connection.cpp
+++ b/cppe/src/IceE/Connection.cpp
@@ -1802,7 +1802,7 @@ Ice::Connection::run()
//
// Dispatch the incoming request.
//
- _in.invoke(response);
+ _in.invoke(response, requestId);
}
}
catch(const LocalException& ex)
diff --git a/cppe/src/IceE/Incoming.cpp b/cppe/src/IceE/Incoming.cpp
index 7109fd5753d..ea4839bd101 100644
--- a/cppe/src/IceE/Incoming.cpp
+++ b/cppe/src/IceE/Incoming.cpp
@@ -50,10 +50,12 @@ IceInternal::Incoming::setAdapter(const Ice::ObjectAdapterPtr& adapter)
}
void
-IceInternal::Incoming::invoke(bool response)
+IceInternal::Incoming::invoke(bool response, Int requestId)
{
assert(_adapter && _servantManager);
+ _current.requestId = requestId;
+
//
// Clear the context from the previous invocation.
//