summaryrefslogtreecommitdiff
path: root/TAO/tao/SystemException.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-02-17 14:04:16 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-02-17 14:04:16 +0000
commit34d2c5bd63f15c25cf5fd39b84ddb25c20601c6c (patch)
tree24b77cc87c3d13282e6128bc939b4b1403f45180 /TAO/tao/SystemException.cpp
parent94f3a741ffc5ad06c8cac7b3b852c4b4e1d341a2 (diff)
downloadATCD-34d2c5bd63f15c25cf5fd39b84ddb25c20601c6c.tar.gz
Tue Feb 17 14:03:39 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp: * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp: * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp: * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp: * tao/Strategies/DIOP_Connector.cpp: * tao/Strategies/SCIOP_Connector.cpp: * tao/Strategies/SHMIOP_Connector.cpp: * tao/Strategies/UIOP_Connector.cpp: Only the return of -1 with cache_transport should be seen as an error * tao/Cache_Entries_T.cpp: Updated some debug statements * tao/Condition.cpp: * tao/Condition.h: Changed delete_lock_ to a bool * tao/Exception.cpp: * tao/SystemException.cpp: Check for self assignment in operator= * tao/IIOP_Connection_Handler.cpp: Layout changes to debug statements and use ACE_TEXT * tao/IIOP_Connector.cpp: Check the return value of cache_transport * tao/Leader_Follower.inl: Const change * tao/LF_CH_Event.cpp: * tao/LF_Event.h: * tao/LF_Event.inl: Addeds state_name to LF_Event and print the state as string instead of number * tao/Strategies/SCIOP_Acceptor.cpp: Fixed gcc warning, don't use ACE_UNUSED_ARG anymore * tao/Strategies/SCIOP_Connection_Handler.cpp: Layout change * tao/String_Alloc.cpp: Simplified check * tao/Transport_Cache_Manager_T.cpp: * tao/Transport_Cache_Manager_T.h: * tao/Transport_Cache_Manager_T.inl: Updated various debug statements. When we have to purge the cache always try to purge the cache with 1 entry else we don't purge when we have a very small cache. Make the maximum transport cache size a real maximum, it was previously not a real maximum, just a default allocation value. This fixes 3570 * tao/Transport_Connector.cpp: Check the return value of cache_transport. * tao/ZIOP/ZIOP.cpp: * tao/ZIOP/ZIOP.h Layout changes * tests/Bug_3558_Regression/client.cpp: * tests/Transport_Cache_Manager/Bug_3558_Regression.cpp: The cache has now a real maximum, updated these tests
Diffstat (limited to 'TAO/tao/SystemException.cpp')
-rw-r--r--TAO/tao/SystemException.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index e1a56457208..79ddeff878c 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -101,10 +101,13 @@ CORBA::SystemException::~SystemException (void)
CORBA::SystemException &
CORBA::SystemException::operator= (const CORBA::SystemException &src)
{
- this->Exception::operator= (src);
+ if (this != &src)
+ {
+ this->Exception::operator= (src);
- this->minor_ = src.minor_;
- this->completed_ = src.completed_;
+ this->minor_ = src.minor_;
+ this->completed_ = src.completed_;
+ }
return *this;
}