diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-01-16 13:03:45 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-01-16 13:03:45 +0100 |
| commit | 3a7e1fda55a94937c8b9504b116a8b9bc29239ca (patch) | |
| tree | c93d574855c871d95b5806bdc817a3ba5c58541b /cpp/src/Ice/Reference.cpp | |
| parent | Fixed ICE-5131 - parsing of -p <version> for proxies, tweaked UDP endpoint de... (diff) | |
| download | ice-3a7e1fda55a94937c8b9504b116a8b9bc29239ca.tar.bz2 ice-3a7e1fda55a94937c8b9504b116a8b9bc29239ca.tar.xz ice-3a7e1fda55a94937c8b9504b116a8b9bc29239ca.zip | |
Fixed ICE-5143 and ICE-5140: stringified proxy and default raw encoding for opaque endpoints
Diffstat (limited to 'cpp/src/Ice/Reference.cpp')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 4983ac40157..ae84b89ffc9 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -290,13 +290,21 @@ IceInternal::Reference::toString() const if(_protocol != Ice::Protocol_1_0) { + // + // We only print the protocol if it's not 1.0. It's fine as + // long as we don't add Ice.Default.ProtocolVersion, a + // stringified proxy will convert back to the same proxy with + // stringToProxy. + // s << " -p " << _protocol; } - if(_encoding != Ice::Encoding_1_0) - { - s << " -e " << _encoding; - } + // + // Always print the encoding version to ensure a stringified proxy + // will convert back to a proxy with the same encoding with + // stringToProxy (and won't use Ice.Default.EncodingVersion). + // + s << " -e " << _encoding; return s.str(); |