diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 14 | ||||
| -rw-r--r-- | cpp/src/IcePatch2/FileServerI.cpp | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 13e08cb29bd..19a0b156ab9 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -694,13 +694,17 @@ IceProxy::Ice::Object::__handleException(const LocalException& ex, int& cnt) ir->getLocatorInfo()->clearObjectCache(ir); } - if(ice_isBatchOneway() || ice_isBatchDatagram()) + if(ice_isOneway() || ice_isBatchOnway()) { // - // We do not retry batch requests (except for problems during - // connection establishment, which are not handled here - // anyway). If we retry a batch request, previous requests - // from the same batch are silently thrown away. + // We do not retry oneway or batch oneway requests (except for + // problems during connection establishment, which are not + // handled here anyway). If we retry a oneway or batch oneway, + // previous oneways from the same batch, or previous oneways + // that are buffered by the IP stack implementation, are + // silently thrown away. This can lead to a situation where + // the latest oneway succeeds due to retry, but former oneways + // are discarded. // ex.ice_throw(); } diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp index 845eac2798f..f160c911070 100644 --- a/cpp/src/IcePatch2/FileServerI.cpp +++ b/cpp/src/IcePatch2/FileServerI.cpp @@ -79,7 +79,7 @@ IcePatch2::FileServerI::getFileCompressed(const string& pa, Int pos, Int num, co if(path.substr(slashPos + 1, endPos - slashPos - 1) == "..") { FileAccessException ex; - ex.reason = "Illegal .. component in path: `" + pa + "'"; + ex.reason = "illegal .. component in path: `" + pa + "'"; throw ex; } slashPos = endPos; |