summaryrefslogtreecommitdiff
path: root/TAO/tao/PortableServer/Servant_Base.cpp
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-02-09 19:45:16 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-02-09 19:45:16 +0000
commit1557d1eaf9c2501476a862ae185e9cfa42b6eb0e (patch)
treeae40a0d115ca41328fde99c9fd03865b689c04d2 /TAO/tao/PortableServer/Servant_Base.cpp
parentbf161d769f5ad8f569fe2ef073682a90c7616f4d (diff)
downloadATCD-1557d1eaf9c2501476a862ae185e9cfa42b6eb0e.tar.gz
ChangeLogTag:Fri Feb 9 11:38:06 2001 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'TAO/tao/PortableServer/Servant_Base.cpp')
-rw-r--r--TAO/tao/PortableServer/Servant_Base.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 06ed32203bc..ee9bd0e96b1 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -325,10 +325,11 @@ TAO_ServantBase_var::~TAO_ServantBase_var (void)
TAO_ServantBase_var &
TAO_ServantBase_var::operator= (TAO_ServantBase *p)
{
+ if (this->ptr_ == p)
+ return *this;
+
if (this->ptr_ != 0)
- {
- this->ptr_->_remove_ref ();
- }
+ this->ptr_->_remove_ref ();
this->ptr_ = p;