diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-08-17 18:50:47 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-08-17 18:50:47 +0000 |
| commit | 4abbc21c92c97476d44e513386113e10cc7dd4d0 (patch) | |
| tree | 81a04d79030da91ce14897df947c9c9815e617ac /TAO/tests/Smart_Proxies/Benchmark/server.cpp | |
| parent | d196265cdae55e994775bd5eb55e623a8b28c9b8 (diff) | |
| download | ATCD-4abbc21c92c97476d44e513386113e10cc7dd4d0.tar.gz | |
Sun Aug 17 18:52:48 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp:
Removed if statements, the regular and else clause had the
exact same code, reported by Coverity
* tests/Smart_Proxies/Benchmark/client.cpp:
* tests/Smart_Proxies/Benchmark/server.cpp:
* tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h:
* tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp:
* tests/Smart_Proxies/On_Demand/client.cpp:
* tests/Smart_Proxies/On_Demand/server.cpp:
* tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp:
* tests/Smart_Proxies/Policy/client.cpp:
* tests/Smart_Proxies/Policy/server.cpp:
* tests/Smart_Proxies/Smart_Proxy_Impl.h:
* tests/Smart_Proxies/client.cpp:
* tests/Smart_Proxies/server.cpp:
Fixed Coverity and valgrind reported errors
Diffstat (limited to 'TAO/tests/Smart_Proxies/Benchmark/server.cpp')
| -rw-r--r-- | TAO/tests/Smart_Proxies/Benchmark/server.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp index e1d7bede99d..ac85e5a3806 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp @@ -72,7 +72,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) switch (c) { case 'o': - ior_output_file = ACE_OS::strdup (get_opts.opt_arg ()); + ior_output_file = get_opts.opt_arg (); break; case '?': default: @@ -147,8 +147,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, - 1); + root_poa->destroy (true, true); + + orb->destroy (); } catch (const CORBA::Exception& ex) { |