Thu Mar 10 11:41:05 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * tao/Stub.h:
          Doxygen changes

        * tao/Stub.cpp:
          Explicitly retrieve the client_strategy factory in the constructor in
          order to force a load of it at this point. Not doing it here leads
          to the situation in the ImR combined example that we want to load
          it later and than get a deadlock

4 files changed, 19 insertions, 8 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c83420c56c5..e8504161db8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Thu Mar 10 11:41:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Stub.h:
+          Doxygen changes
+
+        * tao/Stub.cpp:
+          Explicitly retrieve the client_strategy factory in the constructor in
+          order to force a load of it at this point. Not doing it here leads
+          to the situation in the ImR combined example that we want to load
+          it later and than get a deadlock
+
 Thu Mar 10 11:26:47 UTC 2011  Olli Savia  <ops@iki.fi>
 
         * tao/ZIOP/ZIOP.cpp:
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index e28723215c8..6631c888b9e 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -6,10 +6,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Argv_Type_Converter.h"
 
-
-
 // Default Constructor.
-
 TAO_Naming_Service::TAO_Naming_Service (void)
   : time_ (0)
 {
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index 6fcf63b6024..53a67ecfda7 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -76,6 +76,11 @@ TAO_Stub::TAO_Stub (const char *repository_id,
 
   this->profile_lock_ptr_ = new ACE_Lock_Adapter<TAO_SYNCH_MUTEX> ();
 
+  // Explicit trigger the loading of the client strategy factory at this moment.
+  // Not doing it here could lead to a problem loading it later on during
+  // an upcall
+  (void) this->orb_core_->client_factory ();
+
   this->base_profiles (profiles);
 }
 
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index 66bb2ed25ce..f02eb0bc855 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -399,13 +399,12 @@ protected:
   /**
    * This should be the same value as cached in the ORB_Core. The
    * reason for caching this helps our generated code, notably the
-   * stubs to be decoubled from ORB_Core. Please do not move it away.
+   * stubs to be decoupled from ORB_Core. Please do not move it away.
    */
   CORBA::Boolean const collocation_opt_;
 
-
-  // True if forwarding request upon some specific exceptions
-  // (e.g. OBJECT_NOT_EXIST) already happened.
+  /// True if forwarding request upon some specific exceptions
+  /// (e.g. OBJECT_NOT_EXIST) already happened.
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, bool> forwarded_on_exception_;
 };
 
@@ -434,7 +433,6 @@ public:
 
 protected:
   TAO_Stub *p_;
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL