diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-08-26 10:55:27 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-08-26 10:55:27 -0230 |
| commit | 46d09131d0a09cc415446dc180b95adface56051 (patch) | |
| tree | e55b0ec5faf6b5bbdc68efd0cdc473b084fd74a2 /cpp/src | |
| parent | Fixed (ICE-5472) - WinRT stream acceptor and system allocated port (diff) | |
| download | ice-46d09131d0a09cc415446dc180b95adface56051.tar.bz2 ice-46d09131d0a09cc415446dc180b95adface56051.tar.xz ice-46d09131d0a09cc415446dc180b95adface56051.zip | |
ICE-5649 minor refactor of exception and tracing
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceStorm/TopicI.cpp | 12 | ||||
| -rw-r--r-- | cpp/src/IceStorm/TransientTopicI.cpp | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp index 1c46fc2b72e..65e3548726e 100644 --- a/cpp/src/IceStorm/TopicI.cpp +++ b/cpp/src/IceStorm/TopicI.cpp @@ -568,9 +568,9 @@ TopicImpl::subscribe(const QoS& origQoS, const Ice::ObjectPrx& obj) if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << "subscribe with null subscriber."; + out << _name << ": subscribe: null proxy"; } - throw NullSubscriber(); + throw InvalidSubscriber("subscriber is a null proxy"); } Ice::Identity id = obj->ice_getIdentity(); TraceLevelsPtr traceLevels = _instance->traceLevels(); @@ -743,9 +743,9 @@ TopicImpl::subscribeAndGetPublisher(const QoS& qos, const Ice::ObjectPrx& obj) if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << "subscribe with null subscriber."; + out << _name << ": subscribeAndGetPublisher: null proxy"; } - throw NullSubscriber(); + throw InvalidSubscriber("subscriber is a null proxy"); } Ice::Identity id = obj->ice_getIdentity(); @@ -838,9 +838,9 @@ TopicImpl::unsubscribe(const Ice::ObjectPrx& subscriber) if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << "unsubscribe with null subscriber."; + out << _name << ": unsubscribe: null proxy"; } - return; + throw InvalidSubscriber("subscriber is a null proxy"); } Ice::Identity id = subscriber->ice_getIdentity(); diff --git a/cpp/src/IceStorm/TransientTopicI.cpp b/cpp/src/IceStorm/TransientTopicI.cpp index 0ee6f7d724f..a9b8db2526b 100644 --- a/cpp/src/IceStorm/TransientTopicI.cpp +++ b/cpp/src/IceStorm/TransientTopicI.cpp @@ -174,9 +174,9 @@ TransientTopicImpl::subscribe(const QoS& origQoS, const Ice::ObjectPrx& obj, con if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << "subscribe with null subscriber."; + out << _name << ": subscribe: null proxy"; } - throw NullSubscriber(); + throw InvalidSubscriber("subscriber is a null proxy"); } Ice::Identity id = obj->ice_getIdentity(); TraceLevelsPtr traceLevels = _instance->traceLevels(); @@ -276,9 +276,9 @@ TransientTopicImpl::subscribeAndGetPublisher(const QoS& qos, const Ice::ObjectPr if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << "subscribe with null subscriber."; + out << _name << ": subscribe: null proxy"; } - throw NullSubscriber(); + throw InvalidSubscriber("subscriber is a null proxy"); } Ice::Identity id = obj->ice_getIdentity(); @@ -334,9 +334,9 @@ TransientTopicImpl::unsubscribe(const Ice::ObjectPrx& subscriber, const Ice::Cur if(traceLevels->topic > 0) { Ice::Trace out(traceLevels->logger, traceLevels->topicCat); - out << "unsubscribe with null subscriber."; + out << _name << ": unsubscribe: null proxy"; } - return; + throw InvalidSubscriber("subscriber is a null proxy"); } Ice::Identity id = subscriber->ice_getIdentity(); |