ChangeLogTag: Thu May 7 13:01:00 UTC 2009 Vladimir Zykov <vz@prismtech.com>

4 files changed, 1 insertions, 21 deletions

diff --git a/TAO/tests/Bug_1482_Regression/Client_Task.cpp b/TAO/tests/Bug_1482_Regression/Client_Task.cpp
index 3285a62ed18..822d5322d78 100644
--- a/TAO/tests/Bug_1482_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1482_Regression/Client_Task.cpp
@@ -17,13 +17,6 @@ Client_Task::Client_Task (Test::Hello_ptr receiver,
     , orb_ (CORBA::ORB::_duplicate (o))
 {
   this->handler_var_ = this->handler_._this ();
-  this->handler_var_->_stubobj ()->_incr_refcnt ();
-  this->handler_var_->_add_ref ();
-}
-
-Client_Task::~Client_Task (void)
-{
-  (void) this->handler_var_._retn ();
 }
 
 int
diff --git a/TAO/tests/Bug_1482_Regression/Client_Task.h b/TAO/tests/Bug_1482_Regression/Client_Task.h
index 07e59e3c5c2..c91b880a5a4 100644
--- a/TAO/tests/Bug_1482_Regression/Client_Task.h
+++ b/TAO/tests/Bug_1482_Regression/Client_Task.h
@@ -24,8 +24,6 @@ public:
                CORBA::ORB_ptr o,
                ACE_Thread_Manager *thr_mgr);
 
-  ~Client_Task (void);
-
   /// Thread entry point
   int svc (void);
 
diff --git a/TAO/tests/Bug_1482_Regression/run_test.pl b/TAO/tests/Bug_1482_Regression/run_test.pl
index 871726389ff..bf2db8257e7 100755
--- a/TAO/tests/Bug_1482_Regression/run_test.pl
+++ b/TAO/tests/Bug_1482_Regression/run_test.pl
@@ -47,7 +47,7 @@ $client2 = $CL2->Spawn ();
 $client3 = $CL3->Spawn ();
 
 
-sleep (60);
+sleep (90);
 $SV->WaitKill (3) unless $sv1 < 0;
 $CL1->WaitKill (3);
 $CL2->WaitKill (3);
diff --git a/TAO/tests/Bug_1482_Regression/server.cpp b/TAO/tests/Bug_1482_Regression/server.cpp
index ab25832e277..982e9a5e462 100644
--- a/TAO/tests/Bug_1482_Regression/server.cpp
+++ b/TAO/tests/Bug_1482_Regression/server.cpp
@@ -2,7 +2,6 @@
 
 #include "Hello.h"
 #include "ace/Get_Opt.h"
-#include "Server_Task.h"
 
 ACE_RCSID (LongUpcall_Crash_Test,
            server,
@@ -90,16 +89,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       poa_manager->activate ();
 
-      Server_Task st (orb.in (),
-                      ACE_Thread_Manager::instance ());
-
-      if (st.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Error activating server task\n"));
-
-          return -1;
-        }
       orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));