diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2019-04-26 07:52:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-26 07:52:51 +0200 |
| commit | 629588a38264e5ff3d2fd2a0c8f866d863b332b7 (patch) | |
| tree | e08cb15d12d2994bd53be3db616c98a80321e4a0 /TAO/orbsvcs/examples/Notify | |
| parent | 26212992b6723c287d231fa0a6b8e2ebf059533c (diff) | |
| parent | b940c3951fb908fcdaa3c8490803ac7459dfc0a5 (diff) | |
| download | ATCD-629588a38264e5ff3d2fd2a0c8f866d863b332b7.tar.gz | |
Merge pull request #893 from jwillemsen/jwi-implreprestart-889
Fixed race condition in the ImplRepo on server shutdown/restart
Diffstat (limited to 'TAO/orbsvcs/examples/Notify')
| -rw-r--r-- | TAO/orbsvcs/examples/Notify/Filter/Filter.h | 15 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/Notify/Lanes/Supplier.h | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h | 15 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h | 9 |
4 files changed, 14 insertions, 28 deletions
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h index 5035a351653..6723882544d 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h @@ -169,16 +169,13 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification - ); + const CosNotification::StructuredEvent & notification); - virtual void disconnect_structured_push_consumer ( - ); + virtual void disconnect_structured_push_consumer (); }; /*****************************************************************/ @@ -225,12 +222,10 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier ( - ); + virtual void disconnect_structured_push_supplier (); }; #endif /* NOTIFY_FILTER_CLIENT_H */ diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h index 2e0a6b1227a..fffb548b2f1 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h @@ -58,8 +58,7 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier (void); diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h index 1e1ba4a6a2f..a09e939b37f 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h @@ -159,16 +159,13 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification - ); + const CosNotification::StructuredEvent & notification); - virtual void disconnect_structured_push_consumer ( - ); + virtual void disconnect_structured_push_consumer (); }; /*****************************************************************/ @@ -212,12 +209,10 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier ( - ); + virtual void disconnect_structured_push_supplier (); }; #endif /* NOTIFY_SUBSCRIBE_CLIENT_H */ diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h index 8d078171772..131c4b81deb 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h @@ -60,16 +60,13 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification - ); + const CosNotification::StructuredEvent & notification); - virtual void disconnect_structured_push_consumer ( - ); + virtual void disconnect_structured_push_consumer (); // = Data members |