diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-04-08 17:54:32 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-04-08 17:54:32 +0000 |
| commit | 1f4864cce35506f4c7cd4180b85b0e624986c6a7 (patch) | |
| tree | 9fa7af7d8e3558812dfa0b9c5723f5a3939dc8c9 /TAO/tests | |
| parent | 9669f879b1231dd8c14629d3df963a4c53193ea9 (diff) | |
| download | ATCD-1f4864cce35506f4c7cd4180b85b0e624986c6a7.tar.gz | |
Tue Apr 8 17:55:52 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/DiffServ/client.cpp:
* tests/DiffServ/server.cpp:
Shutdown orb/poa to fix valgrind reported memory leaks
Diffstat (limited to 'TAO/tests')
| -rw-r--r-- | TAO/tests/DiffServ/client.cpp | 6 | ||||
| -rw-r--r-- | TAO/tests/DiffServ/server.cpp | 4 | ||||
| -rw-r--r-- | TAO/tests/Objref_Sequence_Test/server.cpp | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/TAO/tests/DiffServ/client.cpp b/TAO/tests/DiffServ/client.cpp index a27b0eca8d8..d14c203c8c1 100644 --- a/TAO/tests/DiffServ/client.cpp +++ b/TAO/tests/DiffServ/client.cpp @@ -152,7 +152,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) server->test_method (); } + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Calling shutdown on server\n")); + server->shutdown (); + + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Destroying ORB\n")); + + orb->destroy (); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/DiffServ/server.cpp b/TAO/tests/DiffServ/server.cpp index 181543d020b..7ccc9177032 100644 --- a/TAO/tests/DiffServ/server.cpp +++ b/TAO/tests/DiffServ/server.cpp @@ -205,6 +205,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n")); + + root_poa->destroy (1, 1); + + orb->destroy (); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp index 65b8af14aa6..d08c6faa664 100644 --- a/TAO/tests/Objref_Sequence_Test/server.cpp +++ b/TAO/tests/Objref_Sequence_Test/server.cpp @@ -98,7 +98,6 @@ ServerServant::DeleteExtra (const ServerSequence &seq) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Returned after deleting sequences\n")); - } void |