summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>1999-12-21 17:02:25 +0000
committerbala <balanatarajan@users.noreply.github.com>1999-12-21 17:02:25 +0000
commit0742d8bd127ba0880b89e7ca9c0230600fae20b6 (patch)
tree28dadbe13bf96e7a8e281e3d4641218dd2ec127f
parentb82714d5a6ea780e367e712ebbd766e488ef1d2a (diff)
downloadATCD-0742d8bd127ba0880b89e7ca9c0230600fae20b6.tar.gz
ChangeLogTag: Tue Dec 21 10:58:54 1999 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-99c5
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp6
2 files changed, 9 insertions, 2 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index cae75d133fa..63ac069bb43 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,8 @@
+Tue Dec 21 10:58:54 1999 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp (server_is_running):
+ Fixed warnings.
+
Tue Dec 21 09:32:34 1999 David L. Levine <levine@cs.wustl.edu>
* orbsvcs/orbsvcs/Log/LogMgr_i.cpp: removed
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index fe4dcb30a9e..0e771bf002e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -480,7 +480,7 @@ ImplRepo_i::server_is_running (const char *server,
else
return new_location;
- ACE_CHECK_RETURN ("");
+ ACE_CHECK_RETURN (0);
char *pos = ACE_OS::strstr (new_location, "://");
@@ -763,7 +763,9 @@ ImplRepo_i::run (CORBA::Environment &ACE_TRY_ENV)
ACE_TRY
{
if (activation == Server_Info::AUTO_START)
- this->activate_server (server_entry->ext_id_.c_str ());
+ this->activate_server (server_entry->ext_id_.c_str (),
+ ACE_TRY_ENV);
+ ACE_TRY_CHECK;
}
ACE_CATCHANY
{