summaryrefslogtreecommitdiff
path: root/TAO/DevGuideExamples/Multithreading/ThreadPerConnection
diff options
context:
space:
mode:
authorcalabrese_p <calabrese_p@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-06-09 13:47:38 +0000
committercalabrese_p <calabrese_p@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-06-09 13:47:38 +0000
commit8a7b29780402fc3c39504429f742cb427cae7700 (patch)
treea08f31839a112a3abeacfb14f4cabc2f7171e961 /TAO/DevGuideExamples/Multithreading/ThreadPerConnection
parentf7a2a4b58ea58279c52cf8d2e3e23f3beaef95ab (diff)
downloadATCD-8a7b29780402fc3c39504429f742cb427cae7700.tar.gz
Tue Jun 9 13:25:10 UTC 2009 Paul Calabrese <calabrese_p@ociweb.com>
Diffstat (limited to 'TAO/DevGuideExamples/Multithreading/ThreadPerConnection')
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp4
-rw-r--r--TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp2
-rwxr-xr-xTAO/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl2
3 files changed, 4 insertions, 4 deletions
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp
index 22bd190af74..5dc50c06521 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/MessengerServer.cpp
@@ -18,12 +18,12 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
mgr->activate();
// Create a servant.
- Messenger_i messenger_servant;
+ PortableServer::Servant_var<Messenger_i> messenger_servant = new Messenger_i;
// Register the servant with the RootPOA, obtain its object
// reference, stringify it, and write it to a file.
PortableServer::ObjectId_var oid =
- poa->activate_object( &messenger_servant );
+ poa->activate_object( messenger_servant.in() );
CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() );
CORBA::String_var str = orb->object_to_string( messenger_obj.in() );
std::ofstream iorFile( "Messenger.ior" );
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
index 137230f1c26..f5699cb9686 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
@@ -34,6 +34,6 @@ CORBA::Boolean Messenger_i::send_message (
std::ostringstream ostr;
ostr << "Message handled on thread " << ACE_Thread::self();
message = CORBA::string_dup(ostr.str().c_str());
- return 1;
+ return true;
}
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl
index 95c22f3c9de..e669d1d1995 100755
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl
@@ -15,7 +15,7 @@ unlink $ior;
print STDOUT "Starting MessengerServer\n";
-$S = new PerlACE::Process("MessengerServer", "-ORBSvcConf server.conf -ORBEndpoint iiop://localhost");
+$S = new PerlACE::Process("MessengerServer", "-ORBSvcConf server.conf -ORBListenEndpoints iiop://localhost");
$S->Spawn();
if (PerlACE::waitforfile_timed ($ior, $PerlACE::wait_interval_for_process_creation) == -1) {