diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-03-27 09:35:58 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-03-27 09:35:58 +0000 |
| commit | 3191d9ff01626042e77130c5c5c0558e055c4187 (patch) | |
| tree | 0a5674a0b8385e89394316e60fb88cd93c26a448 | |
| parent | 43b23a9c722924e8f8c8829ae051142583704f23 (diff) | |
| download | ATCD-3191d9ff01626042e77130c5c5c0558e055c4187.tar.gz | |
Tue Mar 27 10:40:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com>
Wrong wide char string being compared should always be narrow char.
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tests/ZIOP/client.cpp | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d139049ab97..33f48f44e39 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 27 10:40:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com> + + * tests/ZIOP/client.cpp: + Wrong wide char string being compared should always be narrow char. + Mon Mar 26 22:20:14 UTC 2012 Trevor Fields <fields_t@ociweb.com> * orbsvcs/tests/Notify/Basic/ExtendedFilter.h: @@ -14,10 +19,10 @@ Mon Mar 26 13:11:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot c with compressor name). * tao/ZIOP/ZIOP_Stub.cpp: - Correct client priority compressor selection for sening requests to the + Correct client priority compressor selection for sending requests to the server. The client was selecting compression based upon the Server compressor list priority, not the client compressor list priority, and - could selecty compression even when the server didn't publish any compression + could select compression even when the server didn't publish any compression availablitiy. Fri Mar 23 23:29:21 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/TAO/tests/ZIOP/client.cpp b/TAO/tests/ZIOP/client.cpp index 47dfa9eddf3..186deeca016 100644 --- a/TAO/tests/ZIOP/client.cpp +++ b/TAO/tests/ZIOP/client.cpp @@ -308,7 +308,7 @@ run_string_test (Test::Hello_ptr hello) "This is a test string"); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%C>\n", the_string.in ())); - if (ACE_OS::strstr (the_string._retn (), ACE_TEXT ("Hello there")) == 0) + if (ACE_OS::strstr (the_string._retn (), "Hello there") == 0) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ERROR : run_string_test, unexpected string received\n")), |