ChangeLogTag: Mon Mar 31 08:31:18 UTC 2008 Vladimir Zykov <vladimir.zykov@prismtech.com>

5 files changed, 29 insertions, 11 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b38bc86d012..3c30601a92c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Mon Mar 31 08:31:18 UTC 2008  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tests/Bug_3276_Regression/Manager.h:
+        * tests/Bug_3276_Regression/Manager.cpp:
+        * tests/Bug_3276_Regression/Servant_Locator.h:
+        * tests/Bug_3276_Regression/Bug_3276_Regression.mpc:
+
+          Changed a bit the tests in spirit of TAO and excluded it from
+          corba_e_compact and corba_e_micro builds.
+
 Fri Mar 28 15:30:12 UTC 2008  Vladimir Zykov  <vladimir.zykov@prismtech.com>
 
         * tao/Invocation_Base.h:
diff --git a/TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc b/TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc
index fa17ef0e663..92565612bf4 100644
--- a/TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc
+++ b/TAO/tests/Bug_3276_Regression/Bug_3276_Regression.mpc
@@ -1,11 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client): taoclient, anytypecode, avoids_minimum_corba, pi {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
+project(*Client): taoclient, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   exename = client
+  after += *idl
 
   IDL_Files {
-    test.idl
   }
 
   Source_Files {
@@ -14,9 +21,9 @@ project(*Client): taoclient, anytypecode, avoids_minimum_corba, pi {
   }
 }
 
-project(*Manager): taoserver, avoids_minimum_corba {
+project(*Manager): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   exename = manager
-  after += *Client
+  after += *idl
 
   IDL_Files {
   }
diff --git a/TAO/tests/Bug_3276_Regression/Manager.cpp b/TAO/tests/Bug_3276_Regression/Manager.cpp
index 99873c00bae..35d3167fd10 100644
--- a/TAO/tests/Bug_3276_Regression/Manager.cpp
+++ b/TAO/tests/Bug_3276_Regression/Manager.cpp
@@ -195,11 +195,11 @@ Manager::activate_servant ()
                     Servant_Locator,
                     CORBA::NO_MEMORY ());
 
-  this->servant_locator_.reset (tmp);
+  this->servant_locator_ = tmp;
 
   // Set ServantLocator object as the servant Manager of
   // secondPOA.
-  this->new_poa_var_->set_servant_manager (this->servant_locator_.get ());
+  this->new_poa_var_->set_servant_manager (this->servant_locator_.in ());
 
   // Try to create a reference with user created ID in new_poa
   // which uses ServantLocator.
diff --git a/TAO/tests/Bug_3276_Regression/Manager.h b/TAO/tests/Bug_3276_Regression/Manager.h
index 7ad190181e4..1a24ef65849 100644
--- a/TAO/tests/Bug_3276_Regression/Manager.h
+++ b/TAO/tests/Bug_3276_Regression/Manager.h
@@ -3,7 +3,6 @@
 #ifndef _MANAGER_H_
 #define _MANAGER_H_
 
-#include "ace/Auto_Ptr.h"
 #include "Servant_Locator.h"
 
 class Manager
@@ -36,7 +35,7 @@ private:
   PortableServer::POA_var new_poa_var_;
   // The new poa that is created.
 
-  ACE_Auto_Ptr<Servant_Locator> servant_locator_;
+  PortableServer::ServantLocator_var servant_locator_;
   // Our servant locator
 
   CORBA::Object_var server_;
diff --git a/TAO/tests/Bug_3276_Regression/Servant_Locator.h b/TAO/tests/Bug_3276_Regression/Servant_Locator.h
index a22e5612d7f..edfe869d26e 100644
--- a/TAO/tests/Bug_3276_Regression/Servant_Locator.h
+++ b/TAO/tests/Bug_3276_Regression/Servant_Locator.h
@@ -5,9 +5,11 @@
 
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/ServantLocatorC.h"
-#include "tao/ORB.h"
+#include "tao/LocalObject.h"
 
-class Servant_Locator : public PortableServer::ServantLocator
+class Servant_Locator
+  : public PortableServer::ServantLocator
+  , public virtual TAO_Local_RefCounted_Object
 {
 public:
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
@@ -25,4 +27,4 @@ public:
   // request.
 };
 
-#endif /* _SERVANT_LOCATOR_H */
+#endif /* _SERVANT_LOCATOR_H_ */