1 files changed, 9 insertions, 32 deletions

diff --git a/TAO/tests/NestedUpcall/Reactor/eh_i.cpp b/TAO/tests/NestedUpcall/Reactor/eh_i.cpp
index 0ca6c479613..edc59e21080 100644
--- a/TAO/tests/NestedUpcall/Reactor/eh_i.cpp
+++ b/TAO/tests/NestedUpcall/Reactor/eh_i.cpp
@@ -6,8 +6,7 @@
 ACE_RCSID(Reactor, eh_i, "$Id$")
 
 // CTOR
-EventHandler_i::EventHandler_i (int q)
-  :  quiet_ (q)
+EventHandler_i::EventHandler_i (void)
 {
 }
 
@@ -19,54 +18,32 @@ 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;
 
-  if (!this->quiet_)
-    ACE_DEBUG ((LM_DEBUG,
-                "EventHandler_i::peer() returning %d\n",
-                val));
+  ACE_DEBUG ((LM_DEBUG,
+              "EventHandler_i::peer() returning %d\n",
+              val));
 
   return val;
 }
 
 CORBA::UShort
 EventHandler_i::decrement (Reactor_ptr eh,
-                           CORBA::UShort num,
-                           CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+                      CORBA::UShort num,
+                      CORBA::Environment &env)
 {
-  if (this->quiet_ == 0)
-    {
-      ACE_ASSERT (this->quiet_ == 0);
-      ACE_DEBUG ((LM_DEBUG,
-                  "%{%I(%P|%t) EventHandler::decrement (%d)%$",
-                  num, this->quiet_));
-    }
+  ACE_DEBUG ((LM_DEBUG, "%{%I(%P|%t) EventHandler::decrement (%d)%$", num));
 
   CORBA::UShort ret;
   if (--num <= 0)
     ret = 0;
   else
     {
-      if (!this->quiet_)
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) EventHandler::decrement() "
-                    "invoking Reactor::decrement(%d) %d %$",
-                    num, this->quiet_));
-
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) EventHandler::decrement() invoking Reactor::decrement(%d)%$", num));
       ret = eh->decrement (_this (env), num, env);
     }
-
-  if (this-quiet_ == 0)
-    {
-      ACE_ASSERT (this->quiet_ == 0);
-      ACE_DEBUG ((LM_DEBUG,
-                  "%}(%P|%t) EventHandler::decrement() "
-                  "returning %d%$", ret));
-    }
-
+  ACE_DEBUG ((LM_DEBUG, "%}(%P|%t) EventHandler::decrement() returning %d%$", ret));
   return ret;
 }