*** empty log message ***

5 files changed, 10 insertions, 9 deletions

diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/README b/TAO/tests/Cubit/TAO/IDL_Cubit/README
index 84bdea2c1eb..62d593b30ce 100644
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/README
+++ b/TAO/tests/Cubit/TAO/IDL_Cubit/README
@@ -106,7 +106,7 @@ Sample Run-Using Naming Service:
 	%server -ORBport 19999
 
 2. Start the client
-	%client -ORBport 19999
+	%client -ORBport 19998
 		if you don't want the server to shutdown.
 	%client -ORBport 19998  -x
 		if you want to shutdown the server after this request.
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/client.cpp b/TAO/tests/Cubit/TAO/IDL_Cubit/client.cpp
index b28d9968256..1e512001c15 100644
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/client.cpp
+++ b/TAO/tests/Cubit/TAO/IDL_Cubit/client.cpp
@@ -17,7 +17,7 @@ Cubit_Client::Cubit_Client (void)
     call_count_ (0),
     error_count_ (0),
     cubit_factory_ior_file_ (0),
-    use_naming_service_ (0),
+    use_naming_service_ (1),
     f_handle_ (ACE_INVALID_HANDLE)
 {
 }
@@ -116,8 +116,8 @@ Cubit_Client::parse_args (void)
       case 'x': 
         this->shutdown_ = 1;
         break;
-      case 's': // Use the TAO Naming Service.
-	this->use_naming_service_ = 1;
+      case 's': // Don't use the TAO Naming Service.
+	this->use_naming_service_ = 0;
 	break;
       case '?':
       default:
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/client.h b/TAO/tests/Cubit/TAO/IDL_Cubit/client.h
index 205914e2369..5b82fd36443 100644
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/client.h
+++ b/TAO/tests/Cubit/TAO/IDL_Cubit/client.h
@@ -129,6 +129,6 @@ private:
   // File handle to read the IOR.
 
   int use_naming_service_;
-  // Flag to tell client to use Namingservice to find the cubit
+  // Flag to tell client not to use Namingservice to find the cubit
   // Factory.
 };
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/tests/Cubit/TAO/IDL_Cubit/server.cpp
index 8d5bf9932b0..61764ad37ce 100644
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ b/TAO/tests/Cubit/TAO/IDL_Cubit/server.cpp
@@ -4,7 +4,7 @@
 
 Cubit_Server::Cubit_Server (void)
   :num_of_objs_ (1),
-   use_naming_service_ (0),
+   use_naming_service_ (1),
    ior_output_file_ (0)
 {
 }
@@ -31,8 +31,8 @@ Cubit_Server::parse_args (void)
                              "Unable to open %s for writing: %p\n",
                              get_opts.optarg), -1);
         break;
-      case 's': // use the TAO Naming Service.
-        this->use_naming_service_=1;
+      case 's': // Don't use the TAO Naming Service.
+        this->use_naming_service_=0;
         break;
       case '?':
       default:
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/server.h b/TAO/tests/Cubit/TAO/IDL_Cubit/server.h
index 41d91c38a99..34289d39fe5 100644
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/server.h
+++ b/TAO/tests/Cubit/TAO/IDL_Cubit/server.h
@@ -66,7 +66,8 @@ private:
   // Number of cubit objects we export.
 
   int use_naming_service_;
-  //Flag to tell whether to use the TAO Naming Service.
+  //Flag to tell server not to use the TAO Naming Service to register
+  //the cubit factory.
 
   FILE* ior_output_file_;
   // File to output the cubit factory IOR.