Added requestId to Current.

5 files changed, 13 insertions, 5 deletions

diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index 54ac3c0c1cb..de3d9872570 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -2204,7 +2204,7 @@ Ice::ConnectionI::invokeAll(BasicStream& stream, Int invokeNum, Int requestId, B
 	    // Prepare the invocation.
 	    //
 	    bool response = !_endpoint->datagram() && requestId != 0;
-	    Incoming in(_instance.get(), this, adapter, response, compress);
+	    Incoming in(_instance.get(), this, adapter, response, compress, requestId);
 	    BasicStream* is = in.is();
 	    stream.swap(*is);
 	    BasicStream* os = in.os();
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index d484c158c2a..60ca8228aa8 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -27,7 +27,7 @@ using namespace IceInternal;
 
 IceInternal::IncomingBase::IncomingBase(Instance* instance, ConnectionI* connection, 
 					const ObjectAdapterPtr& adapter,
-					bool response, Byte compress) :
+					bool response, Byte compress, Int requestId) :
     _response(response),
     _compress(compress),
     _os(instance),
@@ -35,6 +35,7 @@ IceInternal::IncomingBase::IncomingBase(Instance* instance, ConnectionI* connect
 {
     _current.adapter = adapter;
     _current.con = _connection;
+    _current.requestId = requestId;
 }
 
 IceInternal::IncomingBase::IncomingBase(IncomingBase& in) :
@@ -71,8 +72,8 @@ IceInternal::IncomingBase::__warning(const string& msg) const
 
 IceInternal::Incoming::Incoming(Instance* instance, ConnectionI* connection, 
 				const ObjectAdapterPtr& adapter,
-				bool response, Byte compress) :
-    IncomingBase(instance, connection, adapter, response, compress),
+				bool response, Byte compress, Int requestId) :
+    IncomingBase(instance, connection, adapter, response, compress, requestId),
     _is(instance)
 {
 }
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 571058bc2dc..441e69ef7bb 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -1336,6 +1336,7 @@ IceDelegateD::Ice::Object::__initCurrent(Current& current, const string& op, Ope
     current.operation = op;
     current.mode = mode;
     current.ctx = context;
+    current.requestId = -1;
 }
 
 void
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 8a5c5dd5873..c256f58c8da 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -2474,7 +2474,6 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
     H << nl << "public:" << sp;
     H.inc();
 
-
     if(!p->isLocal())
     {
         H << nl << "typedef " << name << "Prx ProxyType;";
diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp
index 1e5b2b07e71..0c18079979b 100644
--- a/cpp/src/slice2cppe/Gen.cpp
+++ b/cpp/src/slice2cppe/Gen.cpp
@@ -1678,6 +1678,13 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
     H << nl << "public:" << sp;
     H.inc();
 
+    if(!p->isLocal())
+    {
+        H << nl << "typedef " << name << "Prx ProxyType;";
+    }
+    H << nl << "typedef " << name << "Ptr PointerType;";
+    H << nl;
+
     vector<string> params;
     vector<string> allTypes;
     vector<string> allParamDecls;