ChangeLogTag: Sun May 7 06:59:54 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com>

6 files changed, 39 insertions, 23 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ce22591c835..fdf71f7a0ff 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,14 +1,27 @@
+Sun May  7 06:59:54 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/ORB_Core.cpp:
+
+          Replaced 'new' with ACE_NEW.
+
+        * tests/ORB_Local_Config/Service_Dependency/Test.cpp:
+        * tests/ORB_Local_Config/Shared/Test.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl:
+        * tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h:
+
+          Minor edits and cleanup.
+
 Fri Apr 28 10:47:26 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
 
-	* tao/Stub.cpp: Added a #include of "tao/CDR.h" to support SunC++.
-	  Thanks to Vladimir Panov <gbr at voidland dot org> for reporting
-	  this. 
+        * tao/Stub.cpp: Added a #include of "tao/CDR.h" to support SunC++.
+          Thanks to Vladimir Panov <gbr at voidland dot org> for reporting
+          this.
 
 Fri Apr 14 17:47:18 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
 
-	* docs/releasenotes/index.html: Updated the documentation to 
-	  include more pluggable protocols.  Thanks to Willie Chen
- 	  <wchen12 at ucla dot edu> for motivating this.
+        * docs/releasenotes/index.html: Updated the documentation to
+          include more pluggable protocols.  Thanks to Willie Chen
+          <wchen12 at ucla dot edu> for motivating this.
 
 Fri May  5 18:48:45 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
 
@@ -455,7 +468,7 @@ Fri Apr 28 22:25:57 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
         * tests/ORB_Local_Config/Two_DLL_ORB/Test.cpp:
 
           Modified to eliminate warnings about unused variables on
- 	  ACE_NDEBUG builds.
+          ACE_NDEBUG builds.
 
 Fri Apr 28 22:04:50 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index e2cf1b0e1e4..1aaee6f79cc 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -262,16 +262,20 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
   ACE_NEW (this->request_dispatcher_,
            TAO_Request_Dispatcher);
 
-  /*
-   * @TODO: Get rid of the "magic number" for the Service repository size.
-   * Can this be dynamic container instead?
-   */
+  // @TODO: Can this be dynamic container instead?
   if (ACE_OS::strnlen (this->orbid_, 1) == 0)
-    // (re)use the default/global getsalt
-    ACE_NEW (this->config_, ACE_Service_Gestalt);
+    {
+      ACE_NEW_NORETURN (this->config_,
+                        ACE_Service_Gestalt
+                          (ACE_Service_Gestalt::MAX_SERVICES,
+                           false)); // (Re)use the process-global gestalt
+    }
   else
-    ACE_NEW (this->config_,
-             ACE_Service_Gestalt (ACE_Service_Gestalt::MAX_SERVICES / 4));
+    {
+      ACE_NEW_NORETURN (this->config_,
+                        ACE_Service_Gestalt
+                          (ACE_Service_Gestalt::MAX_SERVICES / 4));
+    }
 }
 
 TAO_ORB_Core::~TAO_ORB_Core (void)
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
index 5c36cf4b4b6..79991afccc0 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
@@ -338,8 +338,8 @@ testServiceDependency (int , ACE_TCHAR *[])
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  testServiceDependency (argc, argv);
-  testOpenDynamicServices (argc, argv);
-  testORBInitializer_Registry(argc, argv);
-  return 0;
+  return
+    testServiceDependency (argc, argv)
+    && testOpenDynamicServices (argc, argv)
+    && testORBInitializer_Registry(argc, argv);
 }
diff --git a/TAO/tests/ORB_Local_Config/Shared/Test.cpp b/TAO/tests/ORB_Local_Config/Shared/Test.cpp
index 409e993c274..9aefa087a93 100644
--- a/TAO/tests/ORB_Local_Config/Shared/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Shared/Test.cpp
@@ -16,8 +16,7 @@ testReusingGlobals (int , ACE_TCHAR *[])
   ACE_TRACE ("testReusingGlobals");
 
   {
-    ACE_Service_Gestalt/*_Test*/ one; // The ACE_Service_Gestalt_Test will teardown all!
-
+    ACE_Service_Gestalt/*_Test*/ one (10, false) ; // The ACE_Service_Gestalt_Test will teardown all!
     one.process_directive (ace_svc_desc_TAO_CORBANAME_Parser);
     one.process_directive (ace_svc_desc_TAO_CORBALOC_Parser);
 
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl
index 2b7f1395785..ac12034402d 100755
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/run_test.pl
@@ -29,7 +29,7 @@ sub test($)
 {
     (my $executable, my $arguments) = @_;
     my $t1 = new PerlACE::Process ($executable, ($arguments ? $arguments : ""));
-    my $status = $t1->SpawnWaitKill (10);
+    my $status = $t1->SpawnWaitKill (120);
     if ($status != 0) {
         print STDERR "ERROR: test failed, status=$status\n";
     }
diff --git a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
index eb8b8f6ebda..7d02ce2ba35 100644
--- a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
+++ b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h
@@ -23,7 +23,7 @@ class ACE_Service_Gestalt_Test : public ACE_Service_Gestalt
     };
 
   ACE_Service_Gestalt_Test ()
-    : ACE_Service_Gestalt ()
+    : ACE_Service_Gestalt (ACE_Service_Repository::DEFAULT_SIZE)
     , teardown_ (true)
     {
     };