summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1998-07-18 21:20:34 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1998-07-18 21:20:34 +0000
commitba86de056c3495348c8ce3c12d5ad20f1b803923 (patch)
treefeab83f4b68bff9be1125c07bcf8c58e23e38589
parent3b03565ca0ce70a74e1883ee1668a36b8daad344 (diff)
downloadATCD-ba86de056c3495348c8ce3c12d5ad20f1b803923.tar.gz
*** empty log message ***
-rw-r--r--TAO/tests/Cubit/TAO/IDL_Cubit/client_i.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/client_i.cpp b/TAO/tests/Cubit/TAO/IDL_Cubit/client_i.cpp
index ff9813ccc78..79e7922d568 100644
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/client_i.cpp
+++ b/TAO/tests/Cubit/TAO/IDL_Cubit/client_i.cpp
@@ -863,7 +863,7 @@ Cubit_Client::~Cubit_Client (void)
CORBA::release (this->cubit_);
if (this->cubit_factory_key_ != 0)
- delete[] (this->cubit_factory_key_);
+ delete [] (this->cubit_factory_key_);
if (this->cubit_key_ != 0)
ACE_OS::free (this->cubit_key_);
@@ -939,9 +939,11 @@ Cubit_Client::init (int argc, char **argv)
if (this->parse_args () == -1)
return -1;
- if (this->use_naming_service_
- && this->init_naming_service () == -1)
- return -1;
+ if (this->use_naming_service_)
+ {
+ if (this->init_naming_service () == -1)
+ return -1;
+ }
else
{
if (this->cubit_factory_key_ == 0)
@@ -950,7 +952,6 @@ Cubit_Client::init (int argc, char **argv)
this->argv_[0]),
-1);
-
CORBA::Object_var factory_object =
this->orb_->string_to_object (this->cubit_factory_key_,
TAO_TRY_ENV);