diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-06-29 13:22:03 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-06-29 13:22:03 +0000 |
| commit | c531e32287bcb3e8abb7d8307ceb8d96ecc8ea90 (patch) | |
| tree | e944dcc7f8eca4c1786e2f514eae94606192f09e | |
| parent | 3d8da1abebfc21f2fd21a44bf8a547c279a0a00e (diff) | |
| download | ATCD-c531e32287bcb3e8abb7d8307ceb8d96ecc8ea90.tar.gz | |
Tue Jun 29 13:19:13 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp:
Fixed crash in notification service with MC enabled, this fixes
bugzilla 3869, thanks to Bogdan Jeram <bjeram at eso dot org> for
reporting this and making a patch
* orbsvcs/orbsvcs/Notify/ProxySupplier.cpp:
Layout changes
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp | 3 |
3 files changed, 16 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a2b9269f803..6d4443ea26b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Tue Jun 29 13:19:13 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp: + Fixed crash in notification service with MC enabled, this fixes + bugzilla 3869, thanks to Bogdan Jeram <bjeram at eso dot org> for + reporting this and making a patch + + * orbsvcs/orbsvcs/Notify/ProxySupplier.cpp: + Layout changes + Mon Jun 28 09:17:34 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp index 75e594a14b9..08053f990d8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp @@ -48,11 +48,11 @@ TAO_MonitorProxySupplier_T<ProxyPushSupplier>::update_queue_count (size_t count) if (this->queue_item_count_ != 0) { // get a count of events that are being held at the consumer level. - size_t pending = - this-> - //typename ProxyPushSupplier:: - TAO_Notify_ProxySupplier::consumer()-> - pending_count(); + size_t pending = 0; + if (TAO_Notify_ProxySupplier::consumer() != 0) + { + pending = this->TAO_Notify_ProxySupplier::consumer()->pending_count(); + } this->queue_item_count_->receive (count + pending); } if (this->child_ != 0) diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp index 309a8dc1dad..c45db8705d1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp @@ -67,8 +67,7 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer) if (max_consumers != 0 && consumer_count >= max_consumers.value ()) { - throw CORBA::IMP_LIMIT ( - ); // we've reached the limit of consumers connected. + throw CORBA::IMP_LIMIT (); // we've reached the limit of consumers connected. } { |