diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-05-04 17:25:23 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-05-04 17:25:23 +0000 |
| commit | e95f3f732745314c7cfe3892477418898fdf6ce8 (patch) | |
| tree | d2eed905621c03942d88026b7b94a0ce3fa4c691 /cpp/src/Ice/ReferenceFactory.cpp | |
| parent | fixing log messages (diff) | |
| download | ice-e95f3f732745314c7cfe3892477418898fdf6ce8.tar.bz2 ice-e95f3f732745314c7cfe3892477418898fdf6ce8.tar.xz ice-e95f3f732745314c7cfe3892477418898fdf6ce8.zip | |
More changes wrt string conversion
Diffstat (limited to 'cpp/src/Ice/ReferenceFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ReferenceFactory.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp index 734fb141d8c..776fa14e478 100644 --- a/cpp/src/Ice/ReferenceFactory.cpp +++ b/cpp/src/Ice/ReferenceFactory.cpp @@ -194,7 +194,6 @@ IceInternal::ReferenceFactory::create(const string& str) // Parsing the identity may raise IdentityParseException. // Identity ident = stringToIdentity(idstr); - if(ident.name.empty()) { // @@ -498,12 +497,14 @@ IceInternal::ReferenceFactory::create(const string& str) beg++; // Skip leading quote } + if(!IceUtil::unescapeString(s, beg, end, adapter) || adapter.size() == 0) { ProxyParseException ex(__FILE__, __LINE__); ex.str = str; throw ex; } + return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, adapter, routerInfo, locatorInfo, _instance->defaultsAndOverrides()->defaultCollocationOptimization, _instance->defaultsAndOverrides()->defaultLocatorCacheTimeout); @@ -537,7 +538,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) // For compatibility with the old FacetPath. // vector<string> facetPath; - s->read(facetPath, false); + s->read(facetPath); string facet; if(!facetPath.empty()) { @@ -545,7 +546,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) { throw ProxyUnmarshalException(__FILE__, __LINE__); } - facet.swap(facetPath[0]); + facet.swap(facetPath[0]); } Byte modeAsByte; @@ -581,7 +582,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) } else { - s->read(adapterId, false); + s->read(adapterId); return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, adapterId, routerInfo, locatorInfo, _instance->defaultsAndOverrides()->defaultCollocationOptimization, _instance->defaultsAndOverrides()->defaultLocatorCacheTimeout); |