summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorJoachim Achtzehnter <joachima@netacquire.com>2020-09-09 15:00:08 -0700
committerJoachim Achtzehnter <joachima@netacquire.com>2020-09-09 15:00:08 -0700
commit63bad09c8b85352c4a83b9c0c70c1bb89c3ea784 (patch)
tree2bdbb7fb5f4a722e0a9fa306b0a26a46f165d3ae /TAO
parent2c5592b264b7305c7a4ba3a802b51ac84535cd17 (diff)
downloadATCD-63bad09c8b85352c4a83b9c0c70c1bb89c3ea784.tar.gz
Changed %s to %C for ACE, added call to duplicate
Diffstat (limited to 'TAO')
-rw-r--r--TAO/tests/CORBA_is_nil/client.cpp24
1 files changed, 19 insertions, 5 deletions
diff --git a/TAO/tests/CORBA_is_nil/client.cpp b/TAO/tests/CORBA_is_nil/client.cpp
index 48c2013a1ac..64307157c0e 100644
--- a/TAO/tests/CORBA_is_nil/client.cpp
+++ b/TAO/tests/CORBA_is_nil/client.cpp
@@ -47,7 +47,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
if (CORBA::is_nil (hello.in ()))
{
ACE_ERROR_RETURN ((LM_DEBUG,
- "Nil Test::Hello reference <%s>\n",
+ "Nil Test::Hello reference <%C>\n",
ior),
1);
}
@@ -55,7 +55,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
CORBA::String_var the_string = hello->get_string ();
ACE_DEBUG ((LM_DEBUG,
- "Hello from file IOR: %s\n",
+ "Hello from file IOR: %C\n",
the_string.in()));
Test::Hello_var helloRef = hello->get_Hello();
@@ -64,7 +64,21 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT("Correctly detected nil Object reference.\n")));
- process_result = 0;
+ CORBA::Object_var var = CORBA::Object::_duplicate(helloRef.in());
+ if (CORBA::is_nil(var))
+ {
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT("Duplicated Object reference works too.\n")));
+ process_result = 0;
+ }
+ else
+ {
+ ACE_ERROR_RETURN ((LM_DEBUG,
+ "ERROR:\n%C\n$%C\n",
+ "CORBA::is_nil(Hello_ptr) returned false!"
+ "CORBA::is_nil(Object_var) returned true!"),
+ 1);
+ }
}
else
{
@@ -72,13 +86,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
if (CORBA::is_nil(obj))
{
ACE_DEBUG ((LM_DEBUG,
- "ERROR (causes exception further down):\n%s\n$s\n",
+ "ERROR (causes exception further down):\n%C\n%C\n",
"CORBA::is_nil(Hello_ptr) returned false!"
"CORBA::is_nil(Object_ptr) returned true!"));
}
CORBA::String_var aString = helloRef->get_string();
ACE_DEBUG ((LM_DEBUG,
- "Received Hello: %s\n",
+ "Received Hello: %C\n",
aString.in()));
}