ChangeLogTag:Thu Jul 22 02:14:24 1999 Irfan Pyarali <irfan@cs.wustl.edu>

2 files changed, 21 insertions, 19 deletions

diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 00bbf2b1a64..128405b1dd8 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -232,6 +232,24 @@ TAO_ORB_Core::init (int &argc, char *argv[])
   // -1 is unknown, default to what the resource factory sets.
   // @@ This is just for backwards compatibility.
 
+#if defined (DEBUG)
+  // Make it a little easier to debug programs using this code.
+  {
+    TAO_debug_level = ACE_Env_Value<u_int> ("TAO_ORB_DEBUG", 0);
+
+    char *value = ACE_OS::getenv ("TAO_ORB_DEBUG");
+
+    if (value != 0)
+      {
+        TAO_debug_level = ACE_OS::atoi (value);
+        if (TAO_debug_level <= 0)
+          TAO_debug_level = 1;
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_debug_level == %d", TAO_debug_level));
+      }
+  }
+#endif  /* DEBUG */
+
   while (arg_shifter.is_anything_left ())
     {
       char *current_arg = arg_shifter.get_current ();
@@ -770,24 +788,6 @@ TAO_ORB_Core::init (int &argc, char *argv[])
         arg_shifter.ignore_arg ();
     }
 
-#if defined (DEBUG)
-  // Make it a little easier to debug programs using this code.
-  {
-    TAO_debug_level = ACE_Env_Value<u_int> ("TAO_ORB_DEBUG", 0);
-
-    char *value = ACE_OS::getenv ("TAO_ORB_DEBUG");
-
-    if (value != 0)
-      {
-        TAO_debug_level = ACE_OS::atoi (value);
-        if (TAO_debug_level <= 0)
-          TAO_debug_level = 1;
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_debug_level == %d", TAO_debug_level));
-      }
-  }
-#endif  /* DEBUG */
-
 #if defined (SIGPIPE) && !defined (ACE_LACKS_UNIX_SIGNALS)
   // There's really no way to deal with this in a portable manner, so
   // we just have to suck it up and get preprocessor conditional and
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 40ec7d8d43b..b1f9828abff 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -29,7 +29,9 @@ TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void)
     use_locked_data_blocks_ (1),
     reactor_type_ (TAO_REACTOR_SELECT_MT),
     cdr_allocator_type_ (TAO_ALLOCATOR_THREAD_LOCK),
-    protocol_factories_ ()
+    protocol_factories_ (),
+    connection_caching_type_ (TAO_CONNECTION_CACHING_STRATEGY),
+    purge_percentage_ (TAO_PURGE_PERCENT)
 {
 }