summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/Proxy.cpp2
-rw-r--r--cpp/src/IcePatch2/FileServerI.cpp4
2 files changed, 3 insertions, 3 deletions
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;