summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2001-03-03 00:32:53 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2001-03-03 00:32:53 +0000
commit247e133daf80232529dada3409a981d03e20f83c (patch)
tree9d0a43decb0564fa7ba580cf273c2ba52c98d2fd
parent98481e87960208c54ffb420e9055a280d4612029 (diff)
downloadATCD-247e133daf80232529dada3409a981d03e20f83c.tar.gz
ChangeLogTag:Fri Mar 2 16:16:45 2001 Ossama Othman <ossama@uci.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a8
-rw-r--r--TAO/tao/Object.cpp16
2 files changed, 17 insertions, 7 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 80a5d97e7e1..685834e532a 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Fri Mar 2 16:16:45 2001 Ossama Othman <ossama@uci.edu>
+
+ * tao/Object.cpp (operator>>):
+
+ Added "ERROR" to the error output so that our automated test
+ suite will pick up the error message. Previously it was not
+ detected. Clarified the error message a bit, as well.
+
Fri Mar 02 15:39:28 2001 Nanbor Wang <nanbor@cs.wustl.edu>
* tao/orbconf.h: Since MEM_Stream is not supported if position
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 8afcab558a7..531587a3bcf 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -575,7 +575,8 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x)
if (TAO_debug_level > 0)
{
ACE_DEBUG ((LM_WARNING,
- ACE_TEXT ("WARNING: extracting object from default ORB_Core\n")));
+ "TAO (%P|%t) WARNING: extracting object from "
+ "default ORB_Core\n"));
}
}
@@ -597,12 +598,13 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x)
// example, hostname lookup failed when binding the
// ACE_INET_Addr to the IIOP profile in being created.
- ACE_DEBUG ((LM_ERROR,
- ACE_TEXT ("TAO (%P|%t) Could not create all ")
- ACE_TEXT ("profiles.\n")
- ACE_TEXT ("This may be due to an address ")
- ACE_TEXT ("resolution problem (e.g. DNS).\n")));
- return 0;
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "TAO (%P|%t) ERROR: Could not create all "
+ "profiles while extracting object\n"
+ "TAO (%P|%t) reference from the CDR stream.\n"
+ "TAO (%P|%t) ERROR: This may be due to an address "
+ "resolution problem (e.g. DNS).\n"),
+ 0);
}
// Ownership of type_hint is given to TAO_Stub