summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2012-03-28 09:42:04 +0000
committersma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2012-03-28 09:42:04 +0000
commit606bb7fbf1776cfa61f3d71eb0c9b7bbd7b19723 (patch)
tree45d25ca28de14c29f284cb424d26239adaa5e1ae
parent1ad2d42d4ace19882a209dd37d9aebd9cac40981 (diff)
downloadATCD-606bb7fbf1776cfa61f3d71eb0c9b7bbd7b19723.tar.gz
Wed Mar 28 10:40:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com>
Correct the test of the contents of the var, use .in() not ._retn() in strstr() call; test was leaking.
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/tests/ZIOP/client.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 53897077a81..d9dc9ba2fe1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 28 10:40:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com>
+
+ * tests/ZIOP/client.cpp:
+ Correct the test of the contents of the var, use .in() not ._retn() in
+ strstr() call; test was leaking.
+
Tue Mar 27 15:53:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com>
* tests/ZIOP/client.cpp:
diff --git a/TAO/tests/ZIOP/client.cpp b/TAO/tests/ZIOP/client.cpp
index 7fd6c7c2e57..bca03553925 100644
--- a/TAO/tests/ZIOP/client.cpp
+++ b/TAO/tests/ZIOP/client.cpp
@@ -309,7 +309,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 (), "Hello there") == 0)
+ if (ACE_OS::strstr (the_string.in (), "Hello there") == 0)
{
ACE_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("ERROR : run_string_test, unexpected string received\n")),