summaryrefslogtreecommitdiff
path: root/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp')
-rw-r--r--TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp b/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp
index 4f92f0edbe9..854a98b7e1a 100644
--- a/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp
@@ -1,12 +1,11 @@
// $Id$
#include "ciao/NodeApplication_CallBackC.h"
-#include "NodeApplication_Task.h"
-#include "tao/RTPortableServer/RTPortableServer.h"
-#include "RTServer_Impl.h"
-#include "ace/Null_Mutex.h"
#include "ciao/CIAO_common.h"
#include "tao/RTPortableServer/RTPortableServer.h"
+#include "ace/Null_Mutex.h"
+#include "NodeApplication_Task.h"
+#include "RTServer_Impl.h"
#if !defined (__ACE_INLINE__)
# include "NodeApplication_Task.inl"
@@ -19,7 +18,7 @@ CIAO::NodeApplication_Task::svc ()
{
CORBA::Object_var object =
this->orb_->resolve_initial_references ("RTORB"
- ACE_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
RTCORBA::RTORB_var rt_orb =
@@ -29,7 +28,7 @@ CIAO::NodeApplication_Task::svc ()
object =
this->orb_->resolve_initial_references ("RootPOA"
- ACE_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
@@ -84,18 +83,18 @@ CIAO::NodeApplication_Task::svc ()
*/
bool retval = nodeapp_servant->init (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
-
+
if (retval)
- {
- ACE_DEBUG ((LM_DEBUG, "NodeApplication Failed on creating and\
+ {
+ ACE_DEBUG ((LM_DEBUG, "NodeApplication Failed on creating and\
initializing the session container!"));
return 1;
}
-
+
CORBA::String_var str = this->orb_->object_to_string (nodeapp_obj.in ()
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
-
+
if (this->options_.ior_output_filename_.length () != 0)
CIAO::Utility::write_IOR (this->options_.ior_output_filename_.c_str (),
str.in ());
@@ -118,7 +117,7 @@ CIAO::NodeApplication_Task::svc ()
CIAO::NodeApplication_Callback_var nam_callback
= CIAO::NodeApplication_Callback::_narrow (object.in ()
- ACE_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
Deployment::Properties_out properties_out (prop.out ());