diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/CHANGES | 10 | ||||
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IcePatch2/FileServerI.cpp | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/cpp/CHANGES b/cpp/CHANGES index ac0be6416cf..af4d46d6426 100644 --- a/cpp/CHANGES +++ b/cpp/CHANGES @@ -1,9 +1,13 @@ Changes since version 2.0.0 --------------------------- -- Ice does not retry batch requests anymore, except for retry of - connection establishement. Otherwise 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 anymore, except if + there are problems during connection establishment. 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. - Fixed race between connection validation and activation for UDP endpoints in thread-per-connection mode. diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 19a0b156ab9..be52398d5c7 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -694,7 +694,7 @@ IceProxy::Ice::Object::__handleException(const LocalException& ex, int& cnt) ir->getLocatorInfo()->clearObjectCache(ir); } - if(ice_isOneway() || ice_isBatchOnway()) + if(ice_isOneway() || ice_isBatchOneway()) { // // We do not retry oneway or batch oneway requests (except for diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp index f160c911070..dd74151ce84 100644 --- a/cpp/src/IcePatch2/FileServerI.cpp +++ b/cpp/src/IcePatch2/FileServerI.cpp @@ -65,7 +65,7 @@ IcePatch2::FileServerI::getFileCompressed(const string& pa, Int pos, Int num, co if(isAbsolute(pa)) { FileAccessException ex; - ex.reason = "Illegal absolute path: `" + pa + "'"; + ex.reason = "illegal absolute path `" + pa + "'"; throw ex; } @@ -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; |