diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-10-30 09:56:09 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-10-30 09:56:09 +0100 |
| commit | 8dd037ee00f6274f79652a30ba275136ef2ce053 (patch) | |
| tree | 346041458c8ff0e2c800740b9e29611f62338786 | |
| parent | ffaae9ead794c3e56e9ef2417ddbecd568b61843 (diff) | |
| parent | 1960578670452b98f7636a1e1acfc1528d455765 (diff) | |
| download | ATCD-8dd037ee00f6274f79652a30ba275136ef2ce053.tar.gz | |
Merge branch 'bug_4213-uiop_corbaloc_key' of git://github.com/milan-mpathix/ATCD into milan-mpathix-bug_4213-uiop_corbaloc_key
| -rw-r--r-- | TAO/tao/CORBALOC_Parser.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Strategies/UIOP_Connector.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index 35c7976cdd7..fd98b445944 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -171,7 +171,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, CORBA::ORB_ptr orb) continue; } - if (*ior == '/') // found key separator + if (*ior == endpoints[ndx].obj_key_sep_) // found key separator { ++ior; break; diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index 1d739ccd8c8..c4abd8dd420 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -86,7 +86,7 @@ TAO_UIOP_Connector::corbaloc_scan (const char *str, size_t &len) str)); return 0; } - len = (separator - str) + 1; + len = separator - str; return this->make_profile (); } |