Foo

1 files changed, 13 insertions, 0 deletions

diff --git a/ace/CORBA_Handler.cpp b/ace/CORBA_Handler.cpp
index bd0fde609c4..2c91d534caa 100644
--- a/ace/CORBA_Handler.cpp
+++ b/ace/CORBA_Handler.cpp
@@ -442,6 +442,19 @@ ACE_MT_CORBA_Handler::process_events (void *)
 {
   ACE_TRACE ("ACE_MT_CORBA_Handler::process_events");
 
+  // Special knowlege, we "know" that we are dealing with a singleton
+  // and that we are invoked in a context where the mutex controlling
+  // instance creation is held, so by the time we get the mutex
+  // the instance must exist.
+  if (ACE_MT_CORBA_Handler::instance_ == 0)
+    {
+      ACE_GUARD_RETURN (ACE_Thread_Mutex, 
+		        ace_mon, 
+		        ace_mt_corba_handler_lock_,
+			0);
+      ACE_ASSERT (ACE_MT_CORBA_Handler::instance_ != 0);
+    }
+
   ACE_Thread_Control t (ACE_MT_CORBA_Handler::instance_->thr_mgr ());
   
   // This thread only processes events.