diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-05-23 22:03:31 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-05-23 22:03:31 +0000 |
| commit | 53774f6775686133a5e67452441b83a2089825b3 (patch) | |
| tree | 3b094eed3f9f858118b4e49f54ddb306e7e80ad2 | |
| parent | d278d716822eb00c9666b6e8e1db9f6679557c3a (diff) | |
| download | ATCD-53774f6775686133a5e67452441b83a2089825b3.tar.gz | |
ChangeLogTag:Fri May 23 17:02:52 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 4 | ||||
| -rw-r--r-- | TAO/tao/ObjectKey_Table.cpp | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index cb9529b8cb3..651a36b02ec 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,7 @@ +Fri May 23 17:02:52 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/ObjectKey_Table.cpp: Some cosmetic fixes. + Fri May 23 15:35:18 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/Object.cpp (is_nil_i): Added a new conditional check for diff --git a/TAO/tao/ObjectKey_Table.cpp b/TAO/tao/ObjectKey_Table.cpp index 867ea212c6d..8af37f9173b 100644 --- a/TAO/tao/ObjectKey_Table.cpp +++ b/TAO/tao/ObjectKey_Table.cpp @@ -94,7 +94,7 @@ TAO::ObjectKey_Table::unbind (TAO::Refcounted_ObjectKey *&key_new) // If the refcount has dropped to 1, just go ahead and unbind it // from the table. - if (key_new->decr_refcount () == 1) + if (key_new && key_new->decr_refcount () == 1) return this->unbind_i (key_new); return 0; @@ -133,17 +133,15 @@ TAO::ObjectKey_Table::bind_i (const TAO::ObjectKey &key, TAO::Refcounted_ObjectKey (key), -1); + + int retval = this->table_.bind (key, key_new); if (retval != -1) - { - key_new->incr_refcount (); - } + key_new->incr_refcount (); else - { - key_new->decr_refcount (); - } + key_new->decr_refcount (); return retval; } |