Minor improvements

    * TAO/tests/CORBA_is_nil/Hello.cpp:
    * TAO/tests/CORBA_is_nil/Hello.h:
    * TAO/tests/CORBA_is_nil/README.md:
    * TAO/tests/CORBA_is_nil/Test.idl:
    * TAO/tests/CORBA_is_nil/server.cpp:

5 files changed, 7 insertions, 11 deletions

diff --git a/TAO/tests/CORBA_is_nil/Hello.cpp b/TAO/tests/CORBA_is_nil/Hello.cpp
index 322d35cde3b..0c842934437 100644
--- a/TAO/tests/CORBA_is_nil/Hello.cpp
+++ b/TAO/tests/CORBA_is_nil/Hello.cpp
@@ -20,5 +20,5 @@ Hello::get_Hello ()
 void
 Hello::shutdown ()
 {
-  this->orb_->shutdown (0);
+  this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/CORBA_is_nil/Hello.h b/TAO/tests/CORBA_is_nil/Hello.h
index 1ddd4e75cf5..1d57cd9c433 100644
--- a/TAO/tests/CORBA_is_nil/Hello.h
+++ b/TAO/tests/CORBA_is_nil/Hello.h
@@ -14,10 +14,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string ();
-  virtual Test::Hello_ptr get_Hello ();
+  char * get_string () override;
+  Test::Hello_ptr get_Hello () override;
 
-  virtual void shutdown ();
+  void shutdown () override;
 
 private:
   /// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/CORBA_is_nil/README.md b/TAO/tests/CORBA_is_nil/README.md
index ef5271b6b1a..3735667d1a7 100644
--- a/TAO/tests/CORBA_is_nil/README.md
+++ b/TAO/tests/CORBA_is_nil/README.md
@@ -11,13 +11,10 @@ function, the specialized variant is *not* called for pointers to
 derived classes. This will work only if TAO ensures that all nil
 object references that have been narrowed to a derived class are
 converted to null pointers, i.e., to ensure that the generic template
-produces the corrcet result.
+produces the correct 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
+uses lazy resource usage, to confirm that CORBA::is_nil correctly
 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 1368541ae02..f3da71c47c8 100644
--- a/TAO/tests/CORBA_is_nil/Test.idl
+++ b/TAO/tests/CORBA_is_nil/Test.idl
@@ -1,4 +1,3 @@
-
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test
 {
diff --git a/TAO/tests/CORBA_is_nil/server.cpp b/TAO/tests/CORBA_is_nil/server.cpp
index 128457baeb9..ae09624b8a5 100644
--- a/TAO/tests/CORBA_is_nil/server.cpp
+++ b/TAO/tests/CORBA_is_nil/server.cpp
@@ -85,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1);
+      root_poa->destroy (true, true);
 
       orb->destroy ();
     }