summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2018-10-30 11:46:56 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2018-10-30 11:46:56 +0100
commit50c131d843bf9f7c38d00ec0a4c26881756aa9aa (patch)
treee28d149786b4aeb3b20a5508727e167ae1ef493a /TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
parent1a7f9bc556a6a74c2a66065af0f0b9489b5aca1e (diff)
parentf776ce71367a69b891db4164f744d62b2ca06205 (diff)
downloadATCD-50c131d843bf9f7c38d00ec0a4c26881756aa9aa.tar.gz
Merge branch 'ssliop_corbaloc_parser_comma_fix' of git://github.com/milan-mpathix/ATCD into milan-mpathix-ssliop_corbaloc_parser_comma_fix
Diffstat (limited to 'TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp')
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp16
1 files changed, 15 insertions, 1 deletions
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
index bf458d40749..d697299e37b 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
@@ -182,7 +182,14 @@ CosNaming_Client::parse_args (void)
int
CosNaming_Client::run (void)
{
- return test_->execute (naming_client_);
+ this->activate();
+ int rv = test_->execute (naming_client_);
+ {
+ CORBA::ORB_var orb = this->orbmgr_.orb();
+ orb->shutdown();
+ }
+ this->wait();
+ return rv;
}
CosNaming_Client::~CosNaming_Client (void)
@@ -1061,6 +1068,13 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
return 0;
}
+int CosNaming_Client::svc()
+{
+ CORBA::ORB_var orb = orbmgr_.orb();
+ orb->run ();
+ return 0;
+}
+
// This function runs the test.
int