diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1999-03-31 13:01:24 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1999-03-31 13:01:24 +0000 |
| commit | 5fee5df7b2a9db419e15f5f4728f793d254533b2 (patch) | |
| tree | 6016a008d65f1ca6d0a99f88b16941a9f363288c | |
| parent | a76399c15be3d858fb4cb6311ef8513f21fc033a (diff) | |
| download | ATCD-5fee5df7b2a9db419e15f5f4728f793d254533b2.tar.gz | |
.
| -rw-r--r-- | TAO/ChangeLog-99c | 6 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 25 |
2 files changed, 15 insertions, 16 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 056c469086e..803b1675843 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,9 @@ +Wed Mar 31 06:58:28 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * tao/ORB.cpp (multicast_to_service): Fixed a couple mistakes in + this function that were causing it to fail on errors. Thanks to + Mike Mazurek <mmazurek@std.saic.com> for reporting this. + Wed Mar 31 03:24:35 1999 Nanbor Wang <nanbor@cs.wustl.edu> * tao/POAS.{h,cpp}: diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index d5024b403c8..f7755e36764 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -659,7 +659,7 @@ CORBA_ORB::multicast_query (char *buf, // Bind listener to any port and then find out what the port was. if (acceptor.open (ACE_Addr::sap_any) == -1 || acceptor.get_local_addr (my_addr) == -1) - ACE_ERROR_RETURN ((LM_DEBUG, + ACE_ERROR_RETURN ((LM_ERROR, "acceptor.open () || " "acceptor.get_local_addr () failed"), -1); @@ -731,11 +731,9 @@ CORBA_ORB::multicast_query (char *buf, // Start listening. if (acceptor.accept (stream, 0, &tv) == -1) - if (TAO_debug_level > 0) - ACE_ERROR_RETURN ((LM_DEBUG, - "multicast_query : Unable to accept\n"), - 0); - + ACE_ERROR_RETURN ((LM_ERROR, + "multicast_query : Unable to accept\n"), + -1); // Receive the IOR. n_bytes = stream.recv (buf, BUFSIZ, @@ -746,14 +744,9 @@ CORBA_ORB::multicast_query (char *buf, // Check for errors. if (n_bytes == -1) - { - if (TAO_debug_level > 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Error reading IIOP multicast response!\n"), - -1); - return -1; - } - + ACE_ERROR_RETURN ((LM_ERROR, + "Error reading IIOP multicast response!\n"), + -1); // Null terminate message. buf[n_bytes] = 0; @@ -762,7 +755,6 @@ CORBA_ORB::multicast_query (char *buf, "%s; Service resolved to ior: <%s>\n", __FILE__, buf)); - return 0; } @@ -794,7 +786,8 @@ CORBA_ORB::multicast_to_service (const char * service_name, // Convert IOR to an object reference. CORBA_Object_ptr objectified_ior = - this->string_to_object ((CORBA::String) buf, env); + this->string_to_object ((CORBA::String) buf, + env); // Check for errors. if (env.exception () == 0) |