Addressed pull request comments

5 files changed, 29 insertions, 10 deletions

diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst
index 303c079e515..5218f2b7e39 100644
--- a/TAO/bin/tao_orb_tests.lst
+++ b/TAO/bin/tao_orb_tests.lst
@@ -210,6 +210,7 @@ TAO/tests/Bug_4059_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MI
 TAO/tests/Bug_4082_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Bug_4097_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Bug_4213_Regression/run_test.pl: !Win32
+TAO/tests/CORBA_is_nil/run_test.pl:
 TAO/tests/DIOP/run_test.pl: !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_MICRO
 TAO/tests/DIOP/run_test_ipv6.pl: IPV6 !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_MICRO
 TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
diff --git a/TAO/tests/CORBA_is_nil/README.md b/TAO/tests/CORBA_is_nil/README.md
index 224707f11ba..ef5271b6b1a 100644
--- a/TAO/tests/CORBA_is_nil/README.md
+++ b/TAO/tests/CORBA_is_nil/README.md
@@ -15,7 +15,9 @@ produces the corrcet result.
 
 This test has the server return a nil object reference and the client
 uses lazy resource usage, to comfirm that CORBA::is_nil corrcetly
-identifies the nil object reference.
+identifies the nil object reference. See issue #1203, which pointed
+out that only CORBA::Object_ptr has a template specialization for
+CORBA::is_nil, but not derived interfaces.
 
 
 
diff --git a/TAO/tests/CORBA_is_nil/Test.idl b/TAO/tests/CORBA_is_nil/Test.idl
index 2373bbec035..1368541ae02 100644
--- a/TAO/tests/CORBA_is_nil/Test.idl
+++ b/TAO/tests/CORBA_is_nil/Test.idl
@@ -16,6 +16,5 @@ module Test
      * This method is used to simplify the test shutdown process
      */
     oneway void shutdown ();
-//    void shutdown ();
   };
 };
diff --git a/TAO/tests/CORBA_is_nil/client.cpp b/TAO/tests/CORBA_is_nil/client.cpp
index fbeca3f5006..5986d99e543 100644
--- a/TAO/tests/CORBA_is_nil/client.cpp
+++ b/TAO/tests/CORBA_is_nil/client.cpp
@@ -58,13 +58,16 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       CORBA::String_var the_string = hello->get_string ();
 
-      std::cout << "Hello from file IOR: " << the_string.in() << std::endl;
+      ACE_DEBUG ((LM_DEBUG,
+                  "Hello from file IOR: %s\n",
+                  the_string.in()));
 
       Test::Hello_var helloRef = hello->get_Hello();
 
       if (CORBA::is_nil(helloRef.in()))
       {
-         std::cout << "Correctly detected nil Object reference." << std::endl;
+         ACE_DEBUG ((LM_DEBUG,
+                     ACE_TEXT("Correctly detected nil Object reference.\n")));
          process_result = 0;
       }
       else
@@ -72,12 +75,15 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
          CORBA::Object_ptr obj = helloRef.in();
          if (CORBA::is_nil(obj))
          {
-            std::cout << "CORBA::is_nil(Hello_ptr) returned false!\n"
-                      << "CORBA::is_nil(Object_ptr) returned true!"
-                      << std::endl;
+            ACE_DEBUG ((LM_DEBUG,
+                        "ERROR (causes exception further down):\n%s\n$s\n",
+                        "CORBA::is_nil(Hello_ptr) returned false!"
+                        "CORBA::is_nil(Object_ptr) returned true!"));
          }
          CORBA::String_var aString = helloRef->get_string();
-         std::cout << "Received Hello: " << aString.in() << std::endl;
+         ACE_DEBUG ((LM_DEBUG,
+                     "Received Hello: %s\n",
+                     aString.in()));
       }
 
       hello->shutdown ();
@@ -92,4 +98,3 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   return process_result;
 }
-
diff --git a/TAO/tests/CORBA_is_nil/run_test.pl b/TAO/tests/CORBA_is_nil/run_test.pl
index e2ee888de4d..aee70bcec96 100755
--- a/TAO/tests/CORBA_is_nil/run_test.pl
+++ b/TAO/tests/CORBA_is_nil/run_test.pl
@@ -25,8 +25,20 @@ my $client_iorfile = $client->LocalFile ($iorbase);
 $server->DeleteFile($iorbase);
 $client->DeleteFile($iorbase);
 
+$conf_file = "svc$PerlACE::svcconf_ext";
+$client_conf = $client->LocalFile ($conf_file);
+
 $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile");
-$CL = $client->CreateProcess ("client", "-ORBSvcConf svc.conf -ORBdebuglevel $debug_level -f file://$client_iorfile");
+
+# copy the configruation file.
+if ($client->PutFile ($conf_file) == -1) {
+    print STDERR "ERROR: cannot set file <$client_conf>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$CL = $client->CreateProcess ("client", "-ORBSvcConf $client_conf -ORBdebuglevel $debug_level -f file://$client_iorfile");
+
 $server_status = $SV->Spawn ();
 
 if ($server_status != 0) {