5 files changed, 23 insertions, 10 deletions
diff --git a/TAO/tests/NestedUpcall/Reactor/Reactor.idl b/TAO/tests/NestedUpcall/Reactor/Reactor.idl
index ae70a317d8b..0ed94064d08 100644
--- a/TAO/tests/NestedUpcall/Reactor/Reactor.idl
+++ b/TAO/tests/NestedUpcall/Reactor/Reactor.idl
@@ -46,7 +46,7 @@ interface Reactor
   // Decrements <num> by invoking the <decrement> operation on <eh>
   // and returning that value, finally stopping when it gets to zero.
 
-  void stop ();
+  oneway void stop ();
   // Stops the reactor.
 };
 
diff --git a/TAO/tests/NestedUpcall/Reactor/eh_i.cpp b/TAO/tests/NestedUpcall/Reactor/eh_i.cpp
index edc59e21080..809325eb7d1 100644
--- a/TAO/tests/NestedUpcall/Reactor/eh_i.cpp
+++ b/TAO/tests/NestedUpcall/Reactor/eh_i.cpp
@@ -18,6 +18,7 @@ EventHandler_i::~EventHandler_i (void)
 // Return a long
 CORBA::Long
 EventHandler_i::peer (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Doesn't matter what value we return!
   CORBA::Long val = 6;
@@ -31,8 +32,9 @@ EventHandler_i::peer (CORBA::Environment &)
 
 CORBA::UShort
 EventHandler_i::decrement (Reactor_ptr eh,
-                      CORBA::UShort num,
-                      CORBA::Environment &env)
+                           CORBA::UShort num,
+                           CORBA::Environment &env)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "%{%I(%P|%t) EventHandler::decrement (%d)%$", num));
 
diff --git a/TAO/tests/NestedUpcall/Reactor/eh_i.h b/TAO/tests/NestedUpcall/Reactor/eh_i.h
index c3b0a729696..b73247c9135 100644
--- a/TAO/tests/NestedUpcall/Reactor/eh_i.h
+++ b/TAO/tests/NestedUpcall/Reactor/eh_i.h
@@ -17,13 +17,15 @@ public:
   virtual ~EventHandler_i (void);
   // Destructor.
 
-  virtual CORBA::Long peer (CORBA::Environment &env);
+  virtual CORBA::Long peer (CORBA::Environment &env)
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // Return some value...doesn't matter what.
 
   virtual CORBA::UShort decrement (Reactor_ptr eh,
                                    CORBA::UShort num,
-                                   CORBA::Environment &env);
-  // deccrement <num> by calling decrement thru <eh> until zero is
+                                   CORBA::Environment &env)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  // decrement <num> by calling decrement thru <eh> until zero is
   // reached, then return.
 };
 
diff --git a/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp b/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp
index fd1e86f26a1..94bf5b09d5b 100644
--- a/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp
+++ b/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp
@@ -19,6 +19,7 @@ Reactor_i::~Reactor_i (void)
 CORBA::Long
 Reactor_i::register_handler (EventHandler_ptr eh,
                              CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) BEGIN Reactor_i::register_handler ()\n"));
@@ -47,6 +48,7 @@ Reactor_i::register_handler (EventHandler_ptr eh,
 
 void
 Reactor_i::set_value (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) doing Reactor_i::set_value()\n"));
@@ -56,6 +58,7 @@ CORBA::UShort
 Reactor_i::decrement (EventHandler_ptr eh,
                       CORBA::UShort num,
                       CORBA::Environment &env)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "%{%I(%P|%t) Reactor::decrement (%d)%$", num));
 
@@ -74,7 +77,9 @@ Reactor_i::decrement (EventHandler_ptr eh,
 
 void
 Reactor_i::stop (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  // @@ TODO Keep an ORB pointer around...
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) stopping.\n"));
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
 }
diff --git a/TAO/tests/NestedUpcall/Reactor/reactor_i.h b/TAO/tests/NestedUpcall/Reactor/reactor_i.h
index bc7b11c391a..97e6759cf3c 100644
--- a/TAO/tests/NestedUpcall/Reactor/reactor_i.h
+++ b/TAO/tests/NestedUpcall/Reactor/reactor_i.h
@@ -18,18 +18,22 @@ public:
   // Destructor.
 
   virtual CORBA::Long register_handler(EventHandler_ptr eh,
-                                       CORBA::Environment &env);
+                                       CORBA::Environment &env)
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // Register (with nothing...it's an example!)
 
-  virtual void set_value (CORBA::Environment &env);
+  virtual void set_value (CORBA::Environment &env)
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::UShort decrement (EventHandler_ptr eh,
                                    CORBA::UShort num,
-                                   CORBA::Environment &env);
+                                   CORBA::Environment &env)
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // deccrement <num> by calling decrement thru <eh> until zero is
   // reached, then return.
 
-  virtual void stop (CORBA::Environment &env);
+  virtual void stop (CORBA::Environment &env)
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // Stops the reactor.
 };