ChangeLogTag: Tue Apr 3 18:29:29 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

4 files changed, 15 insertions, 57 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index eecca780d59..df6a28967ab 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Tue Apr  3 18:29:29 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Bug_2677_Regression/Bug_2677_Regression.mpc:
+
+          Removed the redundant inheritance of taolib.
+
+        * tests/Bug_2677_Regression/DllORB.h:
+        * tests/Bug_2677_Regression/DllORB.cpp:
+
+          Removed the requirement of threads from this test.  It was not
+          necessary to exercise the fix for 2677.
+
 Tue Apr  3 16:10:10 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
         * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
diff --git a/TAO/tests/Bug_2677_Regression/Bug_2677_Regression.mpc b/TAO/tests/Bug_2677_Regression/Bug_2677_Regression.mpc
index 1be33e7c032..52c83ae040b 100644
--- a/TAO/tests/Bug_2677_Regression/Bug_2677_Regression.mpc
+++ b/TAO/tests/Bug_2677_Regression/Bug_2677_Regression.mpc
@@ -6,7 +6,7 @@ project(*server): taoserver {
   }
 }
 
-project: taolib, portableserver {
+project: portableserver {
   sharedname = Bug_2677_Regression
   dynamicflags += BUG_2677_REGRESSION_BUILD_DLL
 
diff --git a/TAO/tests/Bug_2677_Regression/DllORB.cpp b/TAO/tests/Bug_2677_Regression/DllORB.cpp
index 8374cfd14fd..1fbd24e38f8 100644
--- a/TAO/tests/Bug_2677_Regression/DllORB.cpp
+++ b/TAO/tests/Bug_2677_Regression/DllORB.cpp
@@ -1,6 +1,5 @@
 // $Id$
 #include "DllORB.h"
-#include "ace/Barrier.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
@@ -9,7 +8,6 @@
 
 DllORB::DllORB (void)
  : failPrePostInit_ (3),
-   mp_barrier_ (0),
    mv_orb_ (),
    mv_rootPOA_ ()
 {
@@ -18,7 +16,6 @@ DllORB::DllORB (void)
 
 DllORB::~DllORB (void)
 {
-  delete mp_barrier_;
 }
 
 
@@ -123,11 +120,6 @@ DllORB::init (int argc, ACE_TCHAR *argv[])
     return -1;
   }
 
-  mp_barrier_ = new ACE_Thread_Barrier (threadCnt + 1);
-
-  this->activate (THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED, threadCnt);
-  mp_barrier_->wait ();
-
   return 0;
 }
 
@@ -150,12 +142,6 @@ DllORB::fini (void)
       return -1;
     }
 
-  // wait for our threads to finish
-  this->wait ();
-
-  delete mp_barrier_;
-  mp_barrier_ = 0;
-
   try
     {
       mv_orb_->destroy ();
@@ -207,36 +193,4 @@ DllORB::fini (void)
 }
 
 
-int DllORB::svc (void)
-{
-  mp_barrier_->wait ();
-
-  int result = 0;
-
-  try
-    {
-      try
-        {
-          mv_orb_->run ();
-        }
-      catch (const CORBA::BAD_INV_ORDER& ex)
-        {
-          const CORBA::ULong VMCID = ex.minor () & 0xFFFFF000U;
-          const CORBA::ULong minorCode = ex.minor () & 0xFFFU;
-          if (!(VMCID == CORBA::OMGVMCID && minorCode == 4))
-            {
-              throw;
-            }
-        }
-    }
-  catch (...)
-    {
-      ACE_DEBUG ((LM_ERROR, ACE_TEXT ("ERROR: exception\n")));
-      result = 1;
-    }
-
-  return result;
-}
-
-
 ACE_FACTORY_DEFINE (bug_2677_regression, DllORB)
diff --git a/TAO/tests/Bug_2677_Regression/DllORB.h b/TAO/tests/Bug_2677_Regression/DllORB.h
index aed78245943..5ced914b6ff 100644
--- a/TAO/tests/Bug_2677_Regression/DllORB.h
+++ b/TAO/tests/Bug_2677_Regression/DllORB.h
@@ -2,16 +2,12 @@
 #ifndef DLLORB_H
 #define DLLORB_H
 
-#include "ace/Task.h"
+#include "ace/Service_Object.h"
 #include "tao/ORB.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "bug_2677_regression_export.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Thread_Barrier;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-class bug_2677_regression_Export DllORB: public ACE_Task_Base
+class bug_2677_regression_Export DllORB: public ACE_Service_Object
 {
 public:
   DllORB (void);
@@ -23,12 +19,8 @@ public:
 
   virtual int fini (void);
 
-protected:
-  virtual int svc (void);
-
 private:
   unsigned int                   failPrePostInit_;
-  ACE_Thread_Barrier*            mp_barrier_;
   CORBA::ORB_var                 mv_orb_;
   PortableServer::POA_var        mv_rootPOA_;
   PortableServer::POAManager_var mv_poaManager_;