ChangeLogTag: Fri Dec 17 10:38:53 2004 Chad Elliott <elliott_c@ociweb.com>

4 files changed, 63 insertions, 28 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a1263a7a069..403b5efc217 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Fri Dec 17 10:38:53 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/tests/Bug_1436_Regression/run_test.pl:
+
+          Redirect STDERR in the perl script to ensure that the test works
+          on all platforms.
+
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp:
+
+          Fixed a misspelling in some error messages.
+
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
+
+          Replaced a missing switch statement to convert a ParameterMode
+          enum into the corresponding enum for NVList.
+
 Fri Dec 17 08:47:05 2004  Chad Elliott  <elliott_c@ociweb.com>
 
         * orbsvcs/tests/Bug_1437_Regression/run_test.pl:
diff --git a/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl
index 946d75e1d5b..d151187c6a4 100755
--- a/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl
@@ -9,50 +9,51 @@ use lib '../../../../bin';
 use PerlACE::Run_Test;
 
 # The location of the implementation repository binaries
-$ifr_bin_path  = "../../IFR_Service";
+$ifr_bin_path = "../../IFR_Service";
 
-# The location of the tao_ifr IFR utility 
-if ($^O eq "MSWin32") 
-{
-   $tao_ifr_bin_path = "../../../../bin";
-}
-else 
-{
-   $tao_ifr_bin_path = $ifr_bin_path;
-}
+# The location of the tao_ifr IFR utility
+$tao_ifr_bin_path = "../../../../bin";
 
 # IOR file names
-$ifr_ior_file        = PerlACE::LocalFile("ifr.ior");
+$ifr_ior_file = PerlACE::LocalFile("ifr.ior");
 
 # IDL File
-$idl_file            = PerlACE::LocalFile("test.idl");
+$idl_file = PerlACE::LocalFile("test.idl");
 
 #Log file
-$result_file         = PerlACE::LocalFile("test_result.log");
+$result_file = PerlACE::LocalFile("test_result.log");
 
-$IFRSERVICE    = new PerlACE::Process("$ifr_bin_path/IFR_Service");
+$IFRSERVICE = new PerlACE::Process("$ifr_bin_path/IFR_Service");
 $TAO_IFR    = new PerlACE::Process("$tao_ifr_bin_path/tao_ifr");
 
 sub test_body
 {
    unlink $ifr_ior_file;
-   
+
    # Start the IFR Service to generate an IOR file for the tao_ifr to use...
    $IFRSERVICE->Arguments("-o $ifr_ior_file ");
    $IFRSERVICE->Spawn ();
-   
-   if (PerlACE::waitforfile_timed ($ifr_ior_file, 10) == -1) 
+
+   if (PerlACE::waitforfile_timed ($ifr_ior_file, 10) == -1)
    {
       print STDERR "ERROR: cannot find $ifr_ior_file\n";
       $IFRSERVICE->Kill ();
       return 1;
    }
 
-   $TAO_IFR->Arguments("-ORBInitRef InterfaceRepository=file://$ifr_ior_file -Cw $idl_file &> $result_file");
-   $TAO_IFR->Spawn ();  
+   # Redirect STDERR to a log file so that
+   # we can make sure that we got a warning
+   open(STDERR, '>&SAVEERR');
+   open(STDERR, ">$result_file");
 
-   if (PerlACE::waitforfile_timed ($result_file, 10) == -1) 
-   {
+   $TAO_IFR->Arguments("-ORBInitRef InterfaceRepository=file://$ifr_ior_file -Cw $idl_file");
+   $TAO_IFR->SpawnWaitKill (30);
+
+   # Close the log file and restore STDERR
+   close(STDERR);
+   open(SAVEERR, '>&STDERR');
+
+   if (! -r $result_file) {
       print STDERR "ERROR: cannot find $result_file\n";
       $IFRSERVICE->Kill ();
       $TAO_IFR->Kill ();
@@ -66,17 +67,17 @@ sub test_body
        last if $match;
       }
    close FILE;
-   # Tidy up   
+   # Tidy up
    $IFRSERVICE->TerminateWaitKill (5);
    $TAO_IFR->TerminateWaitKill (5);
    return $match ? 0 : -1;
-}   
+}
 
 # Run regression for bug #1436
 $test_result = test_body();
- 
+
 if ($test_result != 0)
-{   
+{
    print STDERR "ERROR: Regression test for Bug #1436 failed\n";
 }
 else
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index 4c9d10a1936..c8e66906d1b 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -100,7 +100,7 @@ Server_Request_Interceptor::receive_request_service_contexts (
       if (group_component.object_group_ref_version != 5)
         {
           ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) Error occureed \n"));
+                      "(%P|%t) Error occurred \n"));
         }
 
     }
@@ -159,7 +159,7 @@ Server_Request_Interceptor::receive_request (
       if (group_component.object_group_ref_version != 5)
         {
           ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) Error occureed \n"));
+                      "(%P|%t) Error occurred \n"));
         }
 
     }
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
index d2abdc57ad9..c9c4e8da6ba 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
@@ -174,10 +174,28 @@ TAO_IFR_Client_Adapter_Impl::create_operation_list (
                TAO::Unknown_IDL_Type (params[i].type.in ()));
       value.replace (unk);
 
+      // Convert the parameter mode to an arg mode
+      CORBA::Flags flags = 0;
+      switch(params[i].mode)
+        {
+        case CORBA::PARAM_IN:
+          flags = CORBA::ARG_IN;
+          break;
+        case CORBA::PARAM_OUT:
+          flags = CORBA::ARG_OUT;
+          break;
+        case CORBA::PARAM_INOUT:
+          flags = CORBA::ARG_INOUT;
+          break;
+        default:
+          // Shouldn't happen
+          ACE_THROW (CORBA::INTERNAL());
+        }
+
       // Add an argument to the NVList.
       result->add_value (params[i].name.in (),
                          value,
-                         params[i].mode);
+                         flags);
    }
 }