summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Cleeland <chris.cleeland@gmail.com>2001-06-27 21:48:05 +0000
committerChris Cleeland <chris.cleeland@gmail.com>2001-06-27 21:48:05 +0000
commit7f4237d9ba6b342bdd1d600014e7367a71ed4d07 (patch)
tree9c7870ddbfc9145faba940a518254be7eb98a423
parentdd14997d768b277425879c3c3bacafe523fe33a5 (diff)
downloadATCD-7f4237d9ba6b342bdd1d600014e7367a71ed4d07.tar.gz
Wed Jun 27 14:25:48 2001 Chris Cleeland <cleeland_c@ociweb.com>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a9
-rw-r--r--TAO/tao/PortableServer/Operation_Table.cpp11
2 files changed, 17 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 3ae3ce7b8f8..37c67b32548 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Wed Jun 27 14:25:48 2001 Chris Cleeland <cleeland_c@ociweb.com>
+
+ * tao/PortableServer/Operation_Table.cpp (find): Enhanced the
+ error message reported when the lookup of the operation fails; it
+ now prints out the operation it was looking for along with the
+ length. Also set the 'skelfunc' reference argument to zero in
+ case of an error, insuring that NOT checking the return value and
+ using the skelfunc will still get an error closer to the problem.
+
Wed Jun 27 15:18:21 2001 Jeff Parsons <parsons@cs.wustl.edu>
* tests/Explicit_Event_Loop/client.cpp:
diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp
index fdd3cb7766b..b61de021503 100644
--- a/TAO/tao/PortableServer/Operation_Table.cpp
+++ b/TAO/tao/PortableServer/Operation_Table.cpp
@@ -246,9 +246,14 @@ TAO_Perfect_Hash_OpTable::find (const char *opname,
const TAO_operation_db_entry *entry = lookup (opname,
length);
if (entry == 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- ACE_TEXT ("TAO_Perfect_Hash_Table:find failed\n")),
- -1);
+ {
+ skelfunc = 0; // insure that somebody can't call a wrong function!
+ ACE_ERROR_RETURN ((LM_ERROR,
+ ACE_TEXT ("TAO_Perfect_Hash_OpTable:find for ")
+ ACE_TEXT ("operation '%s' (length=%d) failed\n"),
+ opname ? opname : "<null string>", length),
+ -1);
+ }
// Valid entry. Figure out the skel_ptr.
skelfunc = entry->skel_ptr_;