Thu Aug 23 22:21:16 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

3 files changed, 56 insertions, 55 deletions

diff --git a/CIAO/DAnCE/Deployment/CIAO_NodeApplication_CallBack.idl b/CIAO/DAnCE/Deployment/CIAO_NodeApplication_CallBack.idl
index 9398507a0ad..b68fa81bf78 100644
--- a/CIAO/DAnCE/Deployment/CIAO_NodeApplication_CallBack.idl
+++ b/CIAO/DAnCE/Deployment/CIAO_NodeApplication_CallBack.idl
@@ -18,6 +18,6 @@ module CIAO
   {
     Deployment::NodeApplicationManager
       register_node_application (in Deployment::NodeApplication na,
-				 out Deployment::Properties properties);
+                                 out Deployment::Properties properties);
   };
 };
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index ab956c1821c..39c773bbee3 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -559,7 +559,7 @@ install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info)
       CIAO_Event_Service_var ciao_es =
         es_factory_.create (es_info.type, es_info.name.in ());
 
-		  // Set up the event channel federations
+      // Set up the event channel federations
       if (es_info.type == CIAO::RTEC)
         {
           // Narrow the event service to CIAO_RT_Event_Service
@@ -571,48 +571,49 @@ install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info)
 
           // Set up the event channel federations
           for (CORBA::ULong j = 0; j < es_info.addr_servs.length (); ++j)
-		        {
-			        bool retv =
-			        ciao_rtes->create_addr_serv (
-				        es_info.addr_servs[j].name.in (),
-				        es_info.addr_servs[j].port,
-				        es_info.addr_servs[j].address);
-
-			        if (retv == false)
-			        {
-				        ACE_DEBUG ((LM_ERROR, "RTEC failed to create addr serv object\t\n"));
-				        throw ::Deployment::InstallationFailure ();
-			        }
-		        }
-
-		      for (CORBA::ULong j = 0; j < es_info.senders.length (); ++j)
-		        {
-			        bool retv =
-			        ciao_rtes->create_sender (
-				        es_info.senders[j].addr_serv_id.in ());
-
-			        if (retv == false)
-			        {
-				        ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP sender object\t\n"));
-				        throw ::Deployment::InstallationFailure ();
-			        }
-		        }
-
-		      for (CORBA::ULong j = 0; j < es_info.receivers.length (); ++j)
-		        {
-			        bool retv =
-			        ciao_rtes->create_receiver (
-				        es_info.receivers[j].addr_serv_id.in (),
-				        es_info.receivers[j].is_multicast,
-				        es_info.receivers[j].listen_port);
-
-			        if (retv == false)
-			        {
-				        ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP receiver object\t\n"));
-				        throw ::Deployment::InstallationFailure ();
-			        }
-		        }
+            {
+              bool retv =
+              ciao_rtes->create_addr_serv (
+                es_info.addr_servs[j].name.in (),
+                es_info.addr_servs[j].port,
+                es_info.addr_servs[j].address);
+
+              if (retv == false)
+              {
+                ACE_DEBUG ((LM_ERROR, "RTEC failed to create addr serv object\t\n"));
+                throw ::Deployment::InstallationFailure ();
+              }
+            }
+
+          for (CORBA::ULong j = 0; j < es_info.senders.length (); ++j)
+          {
+            bool retv =
+            ciao_rtes->create_sender (
+              es_info.senders[j].addr_serv_id.in ());
+
+            if (retv == false)
+            {
+              ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP sender object\t\n"));
+              throw ::Deployment::InstallationFailure ();
+            }
+          }
+
+          for (CORBA::ULong j = 0; j < es_info.receivers.length (); ++j)
+          {
+            bool retv =
+              ciao_rtes->create_receiver (
+                es_info.receivers[j].addr_serv_id.in (),
+                es_info.receivers[j].is_multicast,
+                es_info.receivers[j].listen_port);
+
+            if (retv == false)
+            {
+              ACE_DEBUG ((LM_ERROR, "RTEC failed to create UDP receiver object\t\n"));
+              throw ::Deployment::InstallationFailure ();
+            }
+          }
         }
+
       return ciao_es._retn ();
     }
   catch (const CORBA::Exception& ex)
@@ -620,10 +621,8 @@ install_es (const ::CIAO::DAnCE::EventServiceDeploymentDescription & es_info)
       ex._tao_print_exception ("NodeApplication_Impl::finishLaunch\t\n");
       throw ::Deployment::InstallationFailure ();
     }
-
 }
 
-
 ACE_CString *
 CIAO::NodeApplication_Impl::
 create_connection_key (const Deployment::Connection & connection)
diff --git a/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp b/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
index ae5fb0b06d6..382b11d3082 100644
--- a/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
+++ b/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
@@ -104,15 +104,17 @@ int ZIP_Wrapper::file_list_info (char* zip_name,
       /* add information about current file to the list */
       list.insert_tail (next);
       if ((i+1)<gi.number_entry)
-	{
-	  err = unzGoToNextFile(uf);
-	  if (err!=UNZ_OK)
-	    {
-	      ACE_DEBUG((LM_DEBUG,ACE_TEXT(" unzGoToNextFile failed"
-                         " while trying to go to next file\n"), err));
-	      break;
-	    }
-	}
+        {
+          err = unzGoToNextFile(uf);
+          if (err!=UNZ_OK)
+          {
+            ACE_DEBUG((LM_DEBUG,
+                       ACE_TEXT(" unzGoToNextFile failed"
+                                " while trying to go to next file\n"),
+                       err));
+            break;
+          }
+        }
     }
   unzCloseCurrentFile(uf);
   return gi.number_entry;
@@ -244,7 +246,7 @@ bool ZIP_Wrapper::uncompress (char* zip_archive, char* path, bool verbose)
           makethedir(filename_inzip, arch_dir);
         }
       /* If it is a file, we read its data and write the uncompressed
-	 data to the file with proper path.*/
+         data to the file with proper path.*/
       else if (direc==0)
         {
           handlethefile(filename_inzip, uf, file_info, verbose, arch_dir);