1 files changed, 28 insertions, 48 deletions

diff --git a/TAO/examples/POA/DSI/client.cpp b/TAO/examples/POA/DSI/client.cpp
index a2f9076e2bc..abbaa63e058 100644
--- a/TAO/examples/POA/DSI/client.cpp
+++ b/TAO/examples/POA/DSI/client.cpp
@@ -23,12 +23,11 @@ ACE_RCSID(DSI, client, "$Id$")
 
 static char *IOR = 0;
 static char *IOR_file = 0;
-static int shutdown_server = 0;
 
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "xk:f:");
+  ACE_Get_Opt get_opts (argc, argv, "k:f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -42,17 +41,12 @@ parse_args (int argc, char **argv)
         IOR_file = get_opts.optarg;
         break;
 
-      case 'x':
-        shutdown_server = 1;
-        break;
-
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s"
                            "-k IOR "
                            "-f IOR file "
-                           "-x [for shutting down the server] "
                            "\n",
                            argv [0]),
                           -1);
@@ -107,48 +101,48 @@ main (int argc, char **argv)
                       "CORBA::ORB_init");
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       // Parse the command-line arguments to get the location of the IOR
       if (parse_args (argc, argv) == -1)
         return -1;
-
+      
       if (IOR == 0)
         {
           int result = read_IOR_from_file ();
           if (result != 0)
             ACE_ERROR_RETURN ((LM_ERROR, "Cannot read IOR from %s\n", IOR_file), -1);
         }
-
+      
       ACE_OS::strcpy (str, "CORBA::ORB::string_to_object");
-
+  
       // Get the object reference with the IOR
-      CORBA::Object_var object = orb->string_to_object (IOR,
+      CORBA::Object_var object = orb->string_to_object (IOR, 
                                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       ACE_OS::strcpy (str,"Database::Agent::_narrow");
-
+      
       // Narrow the object reference to a Database::Agent
-      Database::Agent_var database_agent = Database::Agent::_narrow (object.in (),
+      Database::Agent_var database_agent = Database::Agent::_narrow (object.in (), 
                                                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+ 
       Database::NVPairSequence employee_attributes (2);
       employee_attributes.length (2);
-
-      Database::NamedValue &first = employee_attributes[0];
-      Database::NamedValue &second = employee_attributes[1];
-
+      
+      Database::NamedValue &first = employee_attributes[0];    
+      Database::NamedValue &second = employee_attributes[1];    
+      
       char *name = "irfan";
       CORBA::Long id = 555;
-
+      
       first.name = CORBA::string_dup ("name");
       first.value <<= name;
       second.name = CORBA::string_dup ("id");
       second.value <<= id;
-
+      
       ACE_OS::strcpy (str,"Database::Agent::create_entry");
-
+      
       // Create an employee
       Database::Entry_var entry = database_agent->create_entry ("irfan",
                                                                 "Employee",
@@ -156,48 +150,34 @@ main (int argc, char **argv)
                                                                 ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_OS::strcpy (str, "Database::Employee::_narrow");
-
-      Database::Employee_var employee = Database::Employee::_narrow (entry.in (),
+      ACE_OS::strcpy (str,"Database::Employee::_narrow");
+      
+      Database::Employee_var employee = Database::Employee::_narrow (entry.in (), 
                                                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
       /*
-       *
-       *  NOT IMPLEMENTED YET
-       *
+       * 
+       *  NOT IMPLEMENTED YET 
+       * 
        *
        */
-
+      
 #if 0
       // Reset the id
       ACE_OS::strcpy (str, "Database::Employee::id");
-      employee->id (666, ACE_TRY_ENV);
+      employee->id (666, ACE_TRY_ENV);  
       ACE_TRY_CHECK;
 #endif /* 0 */
-
-      ACE_OS::strcpy (str, "Database::Entry::find");
-      // Find the employee
-      entry = database_agent->find_entry ("irfan",
-                                          "Employee",
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      
       ACE_OS::strcpy (str, "Database::Entry::destroy");
       // Destroy the employee
       database_agent->destroy_entry ("irfan",
                                      "Employee",
                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
-      if (shutdown_server)
-        {
-          database_agent->shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-
+           
       ACE_OS::free (IOR);
-
+                 
     }
   ACE_CATCHANY
     {