diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-09-01 21:21:05 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-09-01 21:21:05 +0000 |
| commit | 31b064d4e4f55aadb9f03ab66ac59a94d82adfb6 (patch) | |
| tree | c9e86b395f9c2c45e8205ae8ab99d3c5cbe6b838 /cpp/src/Ice/Proxy.cpp | |
| parent | cleaning up empty identity handling (diff) | |
| download | ice-31b064d4e4f55aadb9f03ab66ac59a94d82adfb6.tar.bz2 ice-31b064d4e4f55aadb9f03ab66ac59a94d82adfb6.tar.xz ice-31b064d4e4f55aadb9f03ab66ac59a94d82adfb6.zip | |
IcePatch work
Diffstat (limited to 'cpp/src/Ice/Proxy.cpp')
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 6e48eaccff3..098987d2d24 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -249,7 +249,7 @@ IceProxy::Ice::Object::ice_facets(const Context& __context) bool IceProxy::Ice::Object::ice_invoke(const string& operation, - bool isIdempotent, + bool idempotent, const vector<Byte>& inParams, vector<Byte>& outParams, const Context& context) @@ -260,7 +260,7 @@ IceProxy::Ice::Object::ice_invoke(const string& operation, try { Handle< ::IceDelegate::Ice::Object> __del = __getDelegate(); - return __del->ice_invoke(operation, isIdempotent, inParams, outParams, context); + return __del->ice_invoke(operation, idempotent, inParams, outParams, context); } catch(const LocationForward& __ex) { @@ -268,7 +268,7 @@ IceProxy::Ice::Object::ice_invoke(const string& operation, } catch(const NonRepeatable& __ex) { - if(isIdempotent) + if(idempotent) { __handleException(*__ex.get(), __cnt); } @@ -817,12 +817,12 @@ IceDelegateM::Ice::Object::ice_facets(const Context& __context) bool IceDelegateM::Ice::Object::ice_invoke(const string& operation, - bool isIdempotent, + bool idempotent, const vector<Byte>& inParams, vector<Byte>& outParams, const Context& context) { - Outgoing __out(__connection, __reference, operation, isIdempotent, context); + Outgoing __out(__connection, __reference, operation, idempotent, context); BasicStream* __os = __out.os(); __os->writeBlob(inParams); bool ok = __out.invoke(); @@ -1192,13 +1192,13 @@ IceDelegateD::Ice::Object::ice_facets(const ::Ice::Context& __context) bool IceDelegateD::Ice::Object::ice_invoke(const string& operation, - bool isIdempotent, + bool idempotent, const vector<Byte>& inParams, vector<Byte>& outParams, const ::Ice::Context& context) { Current current; - __initCurrent(current, operation, isIdempotent, context); + __initCurrent(current, operation, idempotent, context); while(true) { Direct __direct(__adapter, current); @@ -1258,7 +1258,7 @@ IceDelegateD::Ice::Object::__initCurrent(Current& current, const string& op, boo current.id = __reference->identity; current.facet = __reference->facet; current.operation = op; - current.isIdempotent = idempotent; + current.idempotent = idempotent; current.ctx = context; } |