1 files changed, 13 insertions, 29 deletions

diff --git a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl
index 985173e5720..9f6e4572475 100644
--- a/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl
+++ b/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "Container_Base.h"
+#include "Session_Container.h"
 #include "NodeManager/NodeManager_Impl.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/streams.h"
@@ -22,22 +22,16 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       // Get reference to Root POA.
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = PortableServer::POA::_narrow (obj.in ());
 
       // Activate POA manager
       PortableServer::POAManager_var mgr
-        = poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       int homes_table_size =
         sizeof (homes_table)/sizeof(HomeAttributes);
@@ -75,13 +69,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       static_node_manager_impl->init ();
 
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (table_object.in ());
 
       if (CORBA::is_nil (adapter.in ()))
           ACE_ERROR_RETURN ((LM_ERROR, "Nil IORTable\n"), -1);
@@ -90,28 +81,21 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         static_node_manager_impl->_this ();
 
       CORBA::String_var str =
-        orb->object_to_string (manager.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (manager.in ());
 
       adapter->bind ("NodeManager",
-                     str.in ()
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                     str.in ());
 
       // Run the main event loop for the ORB.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   catch (CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
+      ex._tao_print_exception ("Caught CORBA Exception: ");
       return -1;
     }