summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/Notify/Basic
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/Basic')
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h6
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Events.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Events.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp12
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h18
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Sequence.h6
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Simple.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Simple.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Updates.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Updates.h8
12 files changed, 9 insertions, 62 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
index d18ea21d273..13be4bf52ae 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
@@ -108,7 +108,6 @@ AdminProperties_StructuredPushConsumer::AdminProperties_StructuredPushConsumer (
void
AdminProperties_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & /*notification*/
)
- ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
{
++events_received_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
index 91f171853f5..5ce59f56701 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
@@ -32,11 +32,7 @@ public:
// = StructuredPushSupplier methods
virtual void push_structured_event (const CosNotification::StructuredEvent & notification
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException,
- CosEventComm::Disconnected
- ));
+ );
protected:
AdminProperties* client_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 788c8e2e44d..3980a578d17 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -18,8 +18,6 @@ void
Event_StructuredPushConsumer::push_structured_event (
const CosNotification::StructuredEvent & notification
)
- ACE_THROW_SPEC ((CORBA::SystemException,
- CosEventComm::Disconnected))
{
int event_num;
notification.filterable_data[0].value >>= event_num;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h
index f4e6c2b8217..fe3e038ba46 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h
@@ -37,9 +37,7 @@ public:
// = StructuredPushSupplier methods.
virtual void push_structured_event (
const CosNotification::StructuredEvent & notification
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- CosEventComm::Disconnected));
+ );
protected:
Events * test_client_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index 3497a62013f..d5177fa07b7 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -17,10 +17,6 @@ MultiTypes_PushConsumer::MultiTypes_PushConsumer (MultiTypes* client)
void
MultiTypes_PushConsumer::push (const CORBA::Any & /*data*/
)
- ACE_THROW_SPEC ((
- CORBA::SystemException,
- CosEventComm::Disconnected
- ))
{
client_->on_received_event (this);
}
@@ -35,10 +31,6 @@ MultiTypes_StructuredPushConsumer::MultiTypes_StructuredPushConsumer (MultiTypes
void
MultiTypes_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & /*notification*/
)
- ACE_THROW_SPEC ((
- CORBA::SystemException,
- CosEventComm::Disconnected
- ))
{
client_->on_received_event (this);
}
@@ -55,10 +47,6 @@ MultiTypes_SequencePushConsumer::MultiTypes_SequencePushConsumer (MultiTypes* cl
void
MultiTypes_SequencePushConsumer::push_structured_events (const CosNotification::EventBatch & /*notifications*/
)
- ACE_THROW_SPEC ((
- CORBA::SystemException,
- CosEventComm::Disconnected
- ))
{
client_->on_received_event (this);
}
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
index 4b8fa5ed939..1d8e3af7ddf 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
@@ -40,11 +40,7 @@ public:
void push (
const CORBA::Any & data
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException,
- CosEventComm::Disconnected
- ));
+ );
protected:
MultiTypes* client_;
@@ -59,11 +55,7 @@ public:
// = StructuredPushSupplier methods
virtual void push_structured_event (const CosNotification::StructuredEvent & notification
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException,
- CosEventComm::Disconnected
- ));
+ );
protected:
MultiTypes* client_;
@@ -77,11 +69,7 @@ public:
// = SequencePushConsumer methods
virtual void push_structured_events (
const CosNotification::EventBatch & notifications
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException,
- CosEventComm::Disconnected
- ));
+ );
protected:
MultiTypes* client_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index 67ada03200b..a47a9314e37 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -19,8 +19,6 @@ void
SequencePushConsumer::push_structured_events (
const CosNotification::EventBatch &batch
)
- ACE_THROW_SPEC ((CORBA::SystemException,
- CosEventComm::Disconnected))
{
this->test_client_->events_received_ += batch.length ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
index f54484b6de3..08e499df957 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
@@ -36,11 +36,7 @@ public:
// = SequencePushConsumer methods
virtual void push_structured_events (
const CosNotification::EventBatch & notifications
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException,
- CosEventComm::Disconnected
- ));
+ );
protected:
Sequence* test_client_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index faa27ba5776..79690c36c2c 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -16,8 +16,6 @@ Event_AnyPushConsumer::Event_AnyPushConsumer (Simple_Test *test_client)
void
Event_AnyPushConsumer::push (const CORBA::Any & data)
- ACE_THROW_SPEC ((CORBA::SystemException,
- CosEventComm::Disconnected))
{
int event_num;
data >>= event_num;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
index ed80e117075..ef89670dfe7 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
@@ -38,9 +38,7 @@ public:
// = PushSupplier methods
virtual void push (
const CORBA::Any & data
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- CosEventComm::Disconnected));
+ );
protected:
Simple_Test * test_client_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
index 6725fe62063..293f27e2899 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -17,10 +17,6 @@ Updates_StructuredPushConsumer::offer_change (
const CosNotification::EventTypeSeq & added,
const CosNotification::EventTypeSeq & removed
)
- ACE_THROW_SPEC ((
- CORBA::SystemException,
- CosNotifyComm::InvalidEventType
- ))
{
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "StructuredPushConsumer::offer_change invoked:\n"));
@@ -43,8 +39,6 @@ Updates_StructuredPushSupplier::subscription_change (
const CosNotification::EventTypeSeq & added,
const CosNotification::EventTypeSeq & removed
)
- ACE_THROW_SPEC ((CORBA::SystemException,
- CosNotifyComm::InvalidEventType))
{
if (TAO_debug_level)
ACE_DEBUG ((LM_DEBUG, "StructuredPushSupplier::subscription_change invoked:\n"));
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
index e5a222c600a..91a2421db19 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
@@ -35,9 +35,7 @@ public:
// Contructor.
virtual void offer_change (const CosNotification::EventTypeSeq & added,
- const CosNotification::EventTypeSeq & removed)
- ACE_THROW_SPEC ((CORBA::SystemException,
- CosNotifyComm::InvalidEventType));
+ const CosNotification::EventTypeSeq & removed);
// Offer change is conveyed here.
protected:
@@ -58,9 +56,7 @@ public:
virtual void subscription_change (
const CosNotification::EventTypeSeq & added,
const CosNotification::EventTypeSeq & removed
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- CosNotifyComm::InvalidEventType));
+ );
// Subscription change is conveyed here.
protected:
View Lorry Controller Status