ChangeLogTag:Sat Aug 14 15:36:28 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>

5 files changed, 80 insertions, 76 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 6982bbc037c..16999efbf0c 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,16 @@
+Sat Aug 14 15:36:28 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+ 	* DAnCE/NodeManager/NodeDaemon_Impl.cpp:
+	* DAnCE/NodeManager/NodeDaemon_Impl.h:
+	* DAnCE/NodeManager/Node_Daemon.cpp:
+
+	  Cosmetic fixes for fuzz errors and other simple fixes for the
+	  daily builds.
+	
+	* DAnCE/NodeManager/README:
+
+	  Added a README file in the directory.
+
 Sat Aug 14 04:20:44 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
  	* DAnCE/ExecutionManager/ExecutionManager_Impl.h:
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.cpp b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.cpp
index 49cb6647fb1..a48fa385a45 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.cpp
@@ -3,9 +3,6 @@
 #include "NodeDaemon_Impl.h"
 #include "../NodeApplicationManager/NodeApplicationManager_Impl.h"
 
-// @@ (OO) Method definitions should never use "_WITH_DEFAULTS"
-//         versions of emulated exception parameters.  Please remove
-//         the "_WITH_DEFAULTS"
 CIAO::NodeDaemon_Impl::NodeDaemon_Impl (const char *name,
                                         CORBA::ORB_ptr orb,
                                         PortableServer::POA_ptr poa,
@@ -22,27 +19,30 @@ CIAO::NodeDaemon_Impl::NodeDaemon_Impl (const char *name,
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-  {
-    //create the call back poa for NAM.
-    PortableServer::POAManager_var mgr
-      = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    this->callback_poa_ =
-      this->poa_->create_POA ("callback_poa",
-                              mgr.in (),
-                              0
-                              ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+    {
+      //create the call back poa for NAM.
+      PortableServer::POAManager_var mgr
+        = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      this->callback_poa_ =
+        this->poa_->create_POA ("callback_poa",
+                                mgr.in (),
+                                0
+                                ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-  }
+    }
   ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "NodeDaemon_Impl::constructor\t\n");
-    ACE_RE_THROW;
-  }
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "NodeDaemon_Impl::constructor\t\n");
+      // @@ This is bogus and will not work with emulated exceptions
+      // -- Bala
+      ACE_RE_THROW;
+    }
   ACE_ENDTRY;
+  ACE_CHECK;
 }
 
 CIAO::NodeDaemon_Impl::~NodeDaemon_Impl ()
@@ -125,19 +125,12 @@ CIAO::NodeDaemon_Impl::preparePlan (const Deployment::DeploymentPlan &plan
                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          // Obtain the Object Reference
-          //CORBA::Object_var obj =
-          //  this->poa_->servant_to_reference (app_mgr ACE_ENV_ARG_PARAMETER);
-          //ACE_TRY_CHECK;
-
-          //this->manager_ =
-          //  Deployment::NodeApplicationManager::_narrow (obj.in ());
-
           if (CORBA::is_nil (this->manager_.in ()))
             {
-              ACE_DEBUG ((LM_DEBUG,
-                          "NodeDaemon_Impl:preparePlan: "
-                          "NodeApplicationManager ref is nil\n"));
+              ACE_ERROR ((LM_ERROR,
+                          "CIAO.NodeDaemon (%P|%t) -- ",
+                          "preparePlan: NodeApplicationManager ref",
+                          "is nil\n"));
               ACE_TRY_THROW (Deployment::StartError ());
             }
         }
@@ -159,7 +152,8 @@ CIAO::NodeDaemon_Impl::preparePlan (const Deployment::DeploymentPlan &plan
 void
 CIAO::NodeDaemon_Impl::destroyManager (Deployment::NodeApplicationManager_ptr
                                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException, Deployment::StopError))
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::StopError))
 {
   ACE_TRY
     {
@@ -169,10 +163,12 @@ CIAO::NodeDaemon_Impl::destroyManager (Deployment::NodeApplicationManager_ptr
                                      ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
-    this->poa_->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
+    this->poa_->deactivate_object (id.in ()
+                                   ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
-    this->manager_ = Deployment::NodeApplicationManager::_nil ();
+    this->manager_ =
+      Deployment::NodeApplicationManager::_nil ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h
index 7266604d2f7..266d54c77f8 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file NodeDaemon_Impl.h
@@ -7,11 +6,11 @@
  *  $Id$
  *
  *  This file contains servant implementation for Deployment:NodeManager
- *  interface. In the current design of the NodeManager, as with the legacy
- *  implementation of CIAO, Each NodeManager corresponds to ONE NodeApplication
- *  Manager. Though, the name intuitively suggests that there be one NodeManager
- *  for every node, our design, allows the end-user to have multiple components
- *  run on the same node.
+ *  interface. In the current design of the NodeManager, as with the
+ *  legacy  implementation of CIAO, Each NodeManager corresponds to
+ *  ONE NodeApplication Manager. Though, the name intuitively suggests
+ *  that there be one NodeManager  for every node, our design, allows
+ *  the end-user to have multiple components run on the same node.
  *
  *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
  */
@@ -28,13 +27,21 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (_MSC_VER)
+# if (_MSC_VER >= 1200)
+#  pragma warning(push)
+# endif /* _MSC_VER >= 1200 */
+# pragma warning (disable:4250)
+#endif /* _MSC_VER */
+
 
 namespace CIAO
 {
   /**
    * @class NodeDaemon_Impl
    *
-   * @brief Servant implementation CIAO's daemon process control interface
+   * @brief Servant implementation CIAO's daemon process control
+   * interface
    *
    * This class implements the CIAO:NodeDaemon interface.
    *
@@ -51,10 +58,9 @@ namespace CIAO
                      PortableServer::POA_ptr p,
                      const char * nodeapp_loc,
                      int spawn_delay)
-                ACE_THROW_SPEC ((CORBA::SystemException));
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
-    /// Get the containing POA.  This operation does *not*
-    /// increase the reference count of the POA.
+    /// POA operation..
     virtual PortableServer::POA_ptr _default_POA (void);
 
     /// CIAO::Daemon defined attributes/operations.
@@ -88,12 +94,11 @@ namespace CIAO
                        Deployment::StopError));
 
   protected:
-    // Since this class is reference counted, making this
-    // destructor protected to enforce proper memory managment
-    // through the reference counting mechanism (i.e. to
-    // disallow calling operator delete() on an instance of
-    // this class.
-    /// Destructor
+    /// Since this class is reference counted, making this
+    /// destructor protected to enforce proper memory managment
+    /// through the reference counting mechanism (i.e. to
+    /// disallow calling operator delete() on an instance of
+    /// this class.
     virtual ~NodeDaemon_Impl (void);
 
     // Keep a pointer to the managing ORB serving this servant.
@@ -116,7 +121,6 @@ namespace CIAO
 
     // Cache reference of last NodeAppManager
     Deployment::NodeApplicationManager_var manager_;
-
   };
 }
 #if defined (__ACE_INLINE__)
diff --git a/TAO/CIAO/DAnCE/NodeManager/Node_Daemon.cpp b/TAO/CIAO/DAnCE/NodeManager/Node_Daemon.cpp
index b5150ef1bbd..634e9bbafef 100644
--- a/TAO/CIAO/DAnCE/NodeManager/Node_Daemon.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/Node_Daemon.cpp
@@ -1,30 +1,8 @@
 // $Id$
 
-//==============================================================
-/**
- * @file Node_Daemon.cpp
- *
- * @brief CIAO's Node Daemon implementation
- *
- * NodeDaemon is the bootstraping mechanism to create new
- * NodeApplication on the localhost.  We currently depend on
- * starting the NodeApplicationManager process on some port of all
- * the hosts that have NodeApplication install to function properly.
- * The port to run this daemon can be set by using the TAO ORB options
- * command of -ORBEndpoint <port>. This replaces the earlier CIAO_Daemon
- * implementation of CIAO as defined in the CCM specification.
- *
- * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- * @author Tao Lu <lu@dre.vanderbilt.edu>
- */
-//===============================================================
-
 #include "NodeDaemon_Impl.h"
-#include "tao/IORTable/IORTable.h"
-
-// Include Name Service header
 #include "orbsvcs/orbsvcs/CosNamingC.h"
-
+#include "tao/IORTable/IORTable.h"
 #include "ace/SString.h"
 #include "ace/Read_Buffer.h"
 #include "ace/Get_Opt.h"
@@ -121,7 +99,7 @@ register_with_ns (const char * name_context,
   CORBA::Object_var naming_context_object =
     orb->resolve_initial_references ("NameService"
                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  ACE_CHECK_RETURN (false);
 
   CosNaming::NamingContext_var naming_context =
     CosNaming::NamingContext::_narrow (naming_context_object.in ());
diff --git a/TAO/CIAO/DAnCE/NodeManager/README b/TAO/CIAO/DAnCE/NodeManager/README
new file mode 100644
index 00000000000..0860cf39b93
--- /dev/null
+++ b/TAO/CIAO/DAnCE/NodeManager/README
@@ -0,0 +1,13 @@
+/**
+
+@page Node_Daemon README File
+
+      CIAO's NodeDaemon implementation. NodeDaemon is the bootstraping
+mechanism to create new NodeApplication on the localhost.  We
+currently depend on starting the NodeApplicationManager process on
+some port of all the hosts that have NodeApplication install to
+function properly. The port to run this daemon can be set by using the
+TAO ORB options command of -ORBEndpoint <port>. This replaces the
+earlier CIAO_Daemon  implementation of CIAO as defined in the CCM
+specification. 
+*/
\ No newline at end of file