ChangeLogTag:Fri Nov 15 15:13:20 2002 Ossama Othman <ossama@uci.edu>

6 files changed, 42 insertions, 11 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a5af99e1c49..ca03db01d2d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,30 @@
+Fri Nov 15 15:03:02 2002  Ossama Othman  <ossama@uci.edu>
+
+	* orbsvcs/LoadBalancer/Signal_Handler.cpp (activate):
+
+	  sigwait() is not supported on MS Windows, meaning that signals
+	  cannot be handled synchronously with the current implementation
+	  of this signal handler.  Handle signals asynchronously through
+	  the ORB's reactor instead.
+
+	* orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp (init):
+
+	  Fixed buffer overrun problem that was causing an unhandled
+	  exception to be thrown on MS Windows.  The hexidecimal
+	  representation of the time in milliseconds was supposed to be
+	  embedded in a string buffer of 8 characters.  The decimal
+	  representation, which is greater than 8 characters long, was
+	  being embedded into the string instead.
+
+	* orbsvcs/orbsvcs/LoadBalancing/LB_Component.h:
+	* orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp:
+
+	  Cosmetic and spelling fixes/updates.
+
+	* orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h:
+
+	  CORBA::SystemException, not CORBA_SystemException.
+
 Fri Nov 15 16:59:49 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
 	* orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h:
diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
index 421974bfb1d..6e00753699c 100644
--- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
+++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.cpp
@@ -60,7 +60,11 @@ TAO_LB_Signal_Handler::activate (long flags,
                                  size_t stack_size[],
                                  ACE_thread_t thread_ids[])
 {
-#if defined (ACE_HAS_THREADS)
+  // sigwait() is not implemented on MS Windows.  Handle signals
+  // asynchronously through the ORB's reactor in that case instead.
+  // Otherwise, handle signals synchronously in another thread.
+
+#if defined (ACE_HAS_THREADS) && !defined (ACE_WIN32)
   return this->ACE_Task_Base::activate (flags,
                                         n_threads,
                                         force_active,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
index 0e3bc923079..28fd0e9780d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
@@ -134,8 +134,8 @@ ACE_STATIC_SVC_DEFINE (TAO_LB_Component,
                        ACE_TEXT ("LB_Component"),
                        ACE_SVC_OBJ_T,
                        &ACE_SVC_NAME (TAO_LB_Component),
-                       ACE_Service_Type::DELETE_THIS |
-                                  ACE_Service_Type::DELETE_OBJ,
+                       ACE_Service_Type::DELETE_THIS
+                       | ACE_Service_Type::DELETE_OBJ,
                        0)
 
 ACE_FACTORY_DEFINE (TAO_LoadBalancing, TAO_LB_Component)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
index fba947f2314..a0776a30206 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
@@ -30,7 +30,7 @@
  * @class TAO_LB_Component
  *
  * @brief Service_Object that can be used to add load balancer support
- *        to a CORBA-base server.
+ *        to a CORBA-based server.
  *
  * Servers wishing to transparently add load balancing/management
  * support load this object via the ACE_Service_Configurator (e.g. by
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
index 5c68bdb08a2..59415c1d927 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
@@ -79,7 +79,7 @@ TAO_LB_IORInterceptor::components_established (
                                                    orb.in (),
                                                    this->lm_.in ()),
                     CORBA::NO_MEMORY (
-                      CORBA_SystemException::_tao_minor_code (
+                      CORBA::SystemException::_tao_minor_code (
                         TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index c28f5a01c43..27f5ab017f0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -18,7 +18,7 @@ ACE_RCSID (LoadBalancing,
            "$Id$")
 
 
-TAO_LB_LoadManager::TAO_LB_LoadManager (void) 
+TAO_LB_LoadManager::TAO_LB_LoadManager (void)
   : reactor_ (0),
     poa_ (),
     monitor_lock_ (),
@@ -838,7 +838,6 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-
       // The child POA's name will consist of a string that includes
       // the current time in milliseconds in hexidecimal format (only
       // four bytes will be used).  This is an attempt to prevent
@@ -855,8 +854,9 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
         + sizeof (poa_name)
         - 9 /* 8 + 1 */;
 
-      // Overwrite the last 8 characters in the POA name.
-      ACE_OS::sprintf (astr, "%d", time);
+      // Overwrite the last 8 characters in the POA name with the
+      // hexadecimal representation of the time in milliseconds.
+      ACE_OS::sprintf (astr, "%x", time);
 
       this->poa_ = root_poa->create_POA (poa_name,
                                          poa_manager.in (),
@@ -996,8 +996,8 @@ TAO_LB_LoadManager::built_in_strategy (CosLoadBalancing::StrategyInfo * info
     {
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
-                    "ERROR: TAO_LB_LoadManager::built_in_strategy - "
-                    "Unknown/unexpected built-in strategy:\n"
+                    "ERROR: TAO_LB_LoadManager::next_member - "
+                    "Unknown/unexpected built-in Strategy:\n"
                     "     \"%s\"\n",
                     strategy));