diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-05-08 21:20:40 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-05-08 21:20:40 +0000 |
| commit | 0a10b860c60175a85c3fe79eac04e1e7cf52ca99 (patch) | |
| tree | 57e20a91c432a55128638687020cd917feb66d20 | |
| parent | 7654d530ae53763da700d9e01b147d780c7c83cd (diff) | |
| download | ATCD-0a10b860c60175a85c3fe79eac04e1e7cf52ca99.tar.gz | |
Merge from trunk
| -rw-r--r-- | TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp index 9565f5fe7ff..5f6906facac 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp @@ -51,7 +51,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) try { CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); - ACE_CString other_server_ior; + ACE_TCHAR *other_server_ior = 0; int server_num = 0; int reply_delay_secs = 0; @@ -132,11 +132,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) table->bind(poa_name.c_str (), test_ior.in()); // Make invocation to other server before POA is activated. - if (other_server_ior.length () > 0) + if (other_server_ior != 0) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t|%T) Server %d sending request to %s\n"), - server_num, other_server_ior.c_str ())); + server_num, other_server_ior)); try { CORBA::Object_var other_server = |