Wed Jun 16 09:35:25 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com>

        * tests/Two_Objects/Object_Factory_i.cpp:
        * tests/Two_Objects/server.cpp:
        * tests/Faults/test_i.h:
        * tests/CallbackTest/Service.cpp:
        * tests/Portable_Interceptors/Dynamic/server.cpp:
        * tests/Portable_Interceptors/Dynamic/client.cpp:
        * tests/Portable_Interceptors/Bug_2510_Regression/server.cpp:
        * tests/Portable_Interceptors/Bug_2510_Regression/client.cpp:
        * tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp:
        * tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp:
        * tests/Portable_Interceptors/Bug_2133/client.cpp:
        * tests/Portable_Interceptors/Bug_3080/client.cpp:
        * tests/Portable_Interceptors/Register_Initial_References/server.cpp:
        * tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp:
        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp:
        * tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp:
        * tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp:
        * tests/Portable_Interceptors/Bug_3079/client.cpp:
        * tests/Portable_Interceptors/Bug_1559/server.cpp:
        * tests/Portable_Interceptors/Bug_1559/client.cpp:
        * tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp:
        * tests/Portable_Interceptors/Bug_1559/server_interceptor.h:
        * tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp:
        * tests/Portable_Interceptors/Redirection/client.cpp:
        * tests/Portable_Interceptors/IORInterceptor/client.cpp:
        * tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp:
        * tests/Portable_Interceptors/ForwardRequest/client.cpp:
        * tests/CodeSets/simple/server.cpp:
        * tests/MT_BiDir/Sender_i.cpp:
        * tests/MT_BiDir/Sender_i.h:
          Fixed memory leaks local to these tests.

2 files changed, 15 insertions, 11 deletions

diff --git a/TAO/tests/MT_BiDir/Sender_i.cpp b/TAO/tests/MT_BiDir/Sender_i.cpp
index 2ebfaef6978..131b21cd59d 100644
--- a/TAO/tests/MT_BiDir/Sender_i.cpp
+++ b/TAO/tests/MT_BiDir/Sender_i.cpp
@@ -7,7 +7,7 @@ ACE_RCSID(MT_BiDir,
           "$Id$")
 
 
-Sender_i::Sender_i (int no_clients,
+Sender_i::Sender_i (CORBA::ULong no_clients,
                     ACE_Manual_Event &event)
   : event_ (event)
   , receivers_ (0)
@@ -15,10 +15,8 @@ Sender_i::Sender_i (int no_clients,
   , last_index_ (0)
   , payload_ (32768)
 {
-  this->receivers_ =
-    new Receiver *[no_clients * sizeof (Receiver_ptr)];
-  /*ACE_NEW (this->receivers_,
-    Receiver ** [no_clients * sizeof Receiver *]);*/
+  ACE_NEW (this->receivers_,
+           Receiver_var [no_clients]);
 
   // Okay to have a magic number...
   this->payload_.length (32768);
@@ -27,6 +25,10 @@ Sender_i::Sender_i (int no_clients,
     this->payload_[j] = (j % 256);
 }
 
+Sender_i::~Sender_i (void)
+{
+  delete []this->receivers_;
+}
 
 CORBA::Long
 Sender_i::receiver_object (Receiver_ptr recv)
@@ -57,8 +59,8 @@ Sender_i::send_message (void)
 {
   // NOTE:No synchronization with purpose. Synchrnozing this is
   // going to spoil the whole purpose of this test.
-  int send_to =
-    ACE_OS::rand () % this->no_clients_;
+  CORBA::ULong send_to =
+    static_cast<CORBA::ULong> (ACE_OS::rand () % this->no_clients_);
 
   this->receivers_[send_to]->receive_payload (this->payload_);
 }
diff --git a/TAO/tests/MT_BiDir/Sender_i.h b/TAO/tests/MT_BiDir/Sender_i.h
index 419e333f0b4..79032e33f6f 100644
--- a/TAO/tests/MT_BiDir/Sender_i.h
+++ b/TAO/tests/MT_BiDir/Sender_i.h
@@ -20,9 +20,11 @@ class Sender_i
 {
 public:
   /// Constructor
-  Sender_i (int no_clients,
+  Sender_i (CORBA::ULong no_clients,
             ACE_Manual_Event &event);
 
+  virtual ~Sender_i (void);
+
   // = The skeleton methods
   virtual CORBA::Long receiver_object (Receiver *recv);
 
@@ -37,13 +39,13 @@ private:
   ACE_Manual_Event &event_;
 
   /// An array of receiver pointers
-  Receiver **receivers_;
+  Receiver_var *receivers_;
 
   /// Size of the <this->receivers_> array
-  int no_clients_;
+  CORBA::ULong no_clients_;
 
   /// Receiver index
-  int last_index_;
+  CORBA::ULong last_index_;
 
   /// Payload that is being sent
   Receiver::Payload payload_;