Tue Feb 2 11:07:14 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com>

        * tests/Bug_1361_Regression/server.cpp:
        * tests/Bug_1361_Regression/shutdown.cpp:
        * tests/Bug_1361_Regression/client.cpp:
        * tests/Bug_1361_Regression/Echo.cpp:
        * tests/Bug_1361_Regression/Bug_1361_Regression.mpc:
          Simplified the test. It used libTAO_Messaging without any
          need for it.

        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h:
        * tao/AnyTypeCode/Any_Array_Impl_T.cpp:
        * tao/AnyTypeCode/Objref_TypeCode.cpp:
        * tao/PortableServer/Any_SArg_Traits.h:
        * tao/PortableServer/get_arg.h:
        * tao/PI_Server/Policy_Creator_T.h:
        * tao/Load_Protocol_Factory_T.h:
        * tao/TransportCurrent/IIOP_Current_Impl.h:
        * tao/Valuetype/Valuetype_Traits_Base_T.h:
          Added required include.

        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h:
        * tao/TransportCurrent/Current_ORBInitializer.h:
          Removed unnecessary for templates export directive.

        * tao/ImR_Client/ServerObject.pidl:
        * tao/ImR_Client/ImplRepo.pidl:
        * tao/AnyTypeCode/BasicTypeTraits.h:
        * tao/IORTable/IORTable.pidl:
        * tao/Object_Key.pidl:
        * tao/TransportCurrent/Transport_Current.h:
        * tao/TransportCurrent/IIOP_Transport_Current.h:
          Added inclusion guards.

        * tao/AnyTypeCode/Union_TypeCode.h:
          Added necessary forward declaration.

        * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h:
        * tao/PortableServer/Upcall_Command.h:
        * tao/PortableServer/Upcall_Wrapper.h:
        * tao/Object_Reference_Traits_T.h:
        * tao/String_Traits_T.h:
        * tao/Value_Traits_T.h:
        * tao/Array_Traits_T.h:
        * tao/Utils/Servant_Var.inl:
        * tao/Valuetype/Valuetype_Traits_T.h:
          Changed 'ifndef ACE_LACKS_PRAGMA_ONCE' to
          'if !defined (ACE_LACKS_PRAGMA_ONCE)'. So that ifndef is only used
          for inclusion guards in TAO.

        * tao/Transport.cpp:
          Changed 0 to false for boolean type.

        * tao/RTScheduling/ThreadAction.h:
          Fixed code that didn't compile.

5 files changed, 4 insertions, 34 deletions

diff --git a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
index e2c4e4f5bb7..e50d4d3e003 100644
--- a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
+++ b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*Server): taoserver, messaging {
+project(*Server): taoserver {
   after += *idl
   Source_Files {
     TestC.cpp
@@ -22,7 +22,8 @@ project(*Server): taoserver, messaging {
   }
 }
 
-project(*Client): taoclient, messaging {
+project(*Client): taoserver {
+  exename = client
   after += *idl
   Source_Files {
     TestC.cpp
@@ -35,12 +36,11 @@ project(*Client): taoclient, messaging {
   }
 }
 
-project(*Shutdown): taoclient, messaging {
+project(*Shutdown): taoclient {
   exename = shutdown
   after += *idl
   Source_Files {
     TestC.cpp
-    TestS.cpp
     shutdown.cpp
   }
   IDL_Files {
diff --git a/TAO/tests/Bug_1361_Regression/Echo.cpp b/TAO/tests/Bug_1361_Regression/Echo.cpp
index 2a576562d39..bdfc3b0d967 100644
--- a/TAO/tests/Bug_1361_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1361_Regression/Echo.cpp
@@ -49,5 +49,4 @@ Echo::echo_payload_out (Test::Payload_out data)
       // Kill the app
       ACE::terminate_process (ACE_OS::getpid ());
     }
-
 }
diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp
index a4ecf15abba..57ae006f44f 100644
--- a/TAO/tests/Bug_1361_Regression/client.cpp
+++ b/TAO/tests/Bug_1361_Regression/client.cpp
@@ -2,8 +2,6 @@
 
 #include "Echo.h"
 #include "ORB_Task.h"
-#include "tao/Messaging/Messaging.h"
-#include "tao/AnyTypeCode/Any.h"
 #include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
@@ -67,29 +65,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
 
-      CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent");
-
-      CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in ());
-
-      if (CORBA::is_nil (policy_current.in ()))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR: Nil policy current\n"));
-          return 1;
-        }
-      CORBA::Any scope_as_any;
-      scope_as_any <<= Messaging::SYNC_WITH_TRANSPORT;
-
-      CORBA::PolicyList policies(1); policies.length (1);
-      policies[0] =
-        orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            scope_as_any);
-
-      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
-
-      policies[0]->destroy ();
-
       if (parse_args (argc, argv) != 0)
         return 1;
 
diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp
index 9e389c155c5..ae617a640da 100644
--- a/TAO/tests/Bug_1361_Regression/server.cpp
+++ b/TAO/tests/Bug_1361_Regression/server.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "Echo_Caller.h"
-#include "tao/Messaging/Messaging.h"
 #include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp
index d4c8e2320bb..cdf5316cc59 100644
--- a/TAO/tests/Bug_1361_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp
@@ -3,9 +3,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
-// FUZZ: disable check_for_streams_include
-#include "ace/streams.h"
-
 ACE_RCSID(Bug_1361_Regression, shutdown, "$Id$")
 
 #if defined (ACE_OPENVMS)