1 files changed, 21 insertions, 31 deletions

diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp
index 9c405c80786..8d9ada5664a 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp
@@ -28,7 +28,6 @@ Supplier::Supplier (void)
   : ior_ (0),
     use_naming_service_ (1),
     notifier_ (),
-    f_ptr_ (0),
     loop_count_ (10),
     period_value_ (1)
 {
@@ -57,8 +56,8 @@ Supplier::read_ior (char *filename)
 
   if (f_handle == ACE_INVALID_HANDLE)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to open %s for reading\n",
-                        filename),
+                       "Unable to open %s for writing: %p\n",
+                        filename,"file_open"),
                         -1);
 
   ACE_Read_Buffer ior_buffer (f_handle);
@@ -66,7 +65,8 @@ Supplier::read_ior (char *filename)
 
   if (data == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to read ior\n"),
+                       "Unable to read ior: %p\n",
+                       "read_file"),
                       -1);
 
   this->ior_ = ACE_OS::strdup (data);
@@ -82,7 +82,7 @@ Supplier::read_ior (char *filename)
 int
 Supplier::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:f:i:xk:xs");
+  ACE_Get_Opt get_opts (argc_, argv_, "dn:fi:xk:xs");
 
   int c;
   int result;
@@ -156,22 +156,17 @@ Supplier::send_market_status (const char *stock_name,
 
   ACE_TRY
     {
-      
       // Make the RMI.
       this->notifier_->market_status (stock_name,
                                       value,
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception : Supplier::send_market_status");
-      return -1;
-    }
-  ACE_CATCH (CORBA::UserException, userex)
+  ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception : Supplier::send_market_status");
-      return -1;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "Exception raised!\n"),
+                        -1);
     }
   ACE_ENDTRY;
   return 0;
@@ -202,6 +197,11 @@ Supplier::run (void)
                            "schedule_timer"),
                           -1);
 
+   // ACE_DEBUG ((LM_DEBUG,
+   //               "cancelling timer\n"));
+   //  this->reactor_used ()->cancel_timer (timer_id);
+
+
   // The reactor starts executing in a loop.
    this->reactor_used ()->run_event_loop ();
 
@@ -238,18 +238,14 @@ Supplier::via_naming_service (void)
                            ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception : Supplier::via_naming_service\n");
-      return -1;
-    }
-  ACE_CATCH (CORBA::UserException, userex)
-    {
-      ACE_PRINT_EXCEPTION (userex, "User Exception : Supplier::via_naming_service\n");
+      ACE_TRY_ENV.print_exception ("Supplier::via_naming_service\n");
       return -1;
     }
   ACE_ENDTRY;
-    
+  ACE_CHECK_RETURN (-1);
+  
   return 0;
 }
 
@@ -282,7 +278,6 @@ Supplier::init (int argc, char **argv)
                                               this->reactor_used (),
                                               this->f_ptr_),
                       -1);
-
       if (this->use_naming_service_)
         return via_naming_service ();
 
@@ -307,18 +302,13 @@ Supplier::init (int argc, char **argv)
                                            ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception : Supplier::init");
-      return -1;
-    }
-  ACE_CATCH (CORBA::UserException, userex)
+  ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception : Supplier::init");
+      ACE_TRY_ENV.print_exception ("Supplier::init");
       return -1;
     }
   ACE_ENDTRY;
- 
+  ACE_CHECK_RETURN (-1);
   return 0;
 }