diff options
Diffstat (limited to 'cpp/src/Glacier2/ClientBlobject.cpp')
-rw-r--r-- | cpp/src/Glacier2/ClientBlobject.cpp | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/cpp/src/Glacier2/ClientBlobject.cpp b/cpp/src/Glacier2/ClientBlobject.cpp index 85e0139e90a..6f91d3cd4cf 100644 --- a/cpp/src/Glacier2/ClientBlobject.cpp +++ b/cpp/src/Glacier2/ClientBlobject.cpp @@ -20,24 +20,12 @@ Glacier2::ClientBlobject::ClientBlobject(const CommunicatorPtr& communicator, Glacier2::Blobject(communicator, false), _routingTable(routingTable), _allowCategories(allowCategories), - _rejectTraceLevel(_properties->getPropertyAsInt("Glacier2.Client.Trace.Reject")), - _timestamp(IceUtil::Time::now()) + _rejectTraceLevel(_properties->getPropertyAsInt("Glacier2.Client.Trace.Reject")) { } Glacier2::ClientBlobject::~ClientBlobject() { - assert(!_routingTable); -} - -void -Glacier2::ClientBlobject::destroy() -{ - IceUtil::Mutex::Lock lock(*this); - - assert(_routingTable); // Destroyed? - _routingTable = 0; - Blobject::destroy(); } void @@ -45,15 +33,6 @@ Glacier2::ClientBlobject::ice_invoke_async(const Ice::AMD_Array_Object_ice_invok const std::pair<const Byte*, const Byte*>& inParams, const Current& current) { - IceUtil::Mutex::Lock lock(*this); - - if(!_routingTable) // Destroyed? - { - ObjectNotExistException ex(__FILE__, __LINE__); - ex.id = current.id; - throw ex; - } - // // If there is an _allowCategories set then enforce it. // @@ -93,26 +72,3 @@ Glacier2::ClientBlobject::ice_invoke_async(const Ice::AMD_Array_Object_ice_invok invoke(proxy, amdCB, inParams, current); } - -IceUtil::Time -Glacier2::ClientBlobject::getTimestamp() const -{ - IceUtil::Mutex::TryLock lock(*this); - - if(lock.acquired()) - { - return _timestamp; - } - else - { - return IceUtil::Time::now(); - } -} - -void -Glacier2::ClientBlobject::updateTimestamp() -{ - IceUtil::Mutex::Lock lock(*this); - - _timestamp = IceUtil::Time::now(); -} |