Merge branch 'omu/SalomeLauncher'

[modules/kernel.git] / src / NamingService / NamingService_WaitForServerReadiness.cxx

diff --git a/src/NamingService/NamingService_WaitForServerReadiness.cxx b/src/NamingService/NamingService_WaitForServerReadiness.cxx
index deab8d1a95e8717e477f6c04a9db30beabce151b..d9b054bd4b3e1cdad321ba2b8746afbd5657d55a 100644 (file)
--- a/src/NamingService/NamingService_WaitForServerReadiness.cxx
+++ b/src/NamingService/NamingService_WaitForServerReadiness.cxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : NamingService_WaitForServerReadiness.cxx
 //  Author : Paul RASCLE (EDF)
 //  Module : KERNEL
@@ -29,8 +30,6 @@
 #include <iostream>
 #include <ctime>
 
-using namespace std;
-
 // ============================================================================
 /*!
  * Wait until a server is registered in naming service.
@@ -46,7 +45,7 @@ using namespace std;
 
 
 void NamingService_WaitForServerReadiness(SALOME_NamingService* NS,
-                                         string serverName)
+                                          std::string serverName)
 {
   long TIMESleep = 500000000; // 500 ms.
   int NumberOfTries = 40;     // total wait = 20 s.
@@ -63,38 +62,38 @@ void NamingService_WaitForServerReadiness(SALOME_NamingService* NS,
   for (int itry=0; itry < NumberOfTries; itry++)
     {
       try
-       {
-         if (serverName.length() == 0)
-           {
+        {
+          if (serverName.length() == 0)
+            {
               CORBA::String_var dummyadr = NS->getIORaddr(); // to wait for naming service
-             found = 1;
-             break; // naming service found
-           }
-         else
-           {
-             CORBA::Object_var obj = NS->Resolve(serverName.c_str());
-             if (! CORBA::is_nil(obj))
-               {
-                 found =1;
-                 break; // server found, no more try to do
-               }
-             MESSAGE("Server "<< serverName <<" not yet ready, waiting...");
+              found = 1;
+              break; // naming service found
+            }
+          else
+            {
+              CORBA::Object_var obj = NS->Resolve(serverName.c_str());
+              if (! CORBA::is_nil(obj))
+                {
+                  found =1;
+                  break; // server found, no more try to do
+                }
+              MESSAGE("Server "<< serverName <<" not yet ready, waiting...");
 #ifndef WIN32
               nanosleep(&ts_req,&ts_rem); // wait before retry
 #else
               Sleep(TIMESleep/1000000);
 #endif
-           }
-       }
+            }
+        }
       catch( ServiceUnreachable& )
-       {
-         MESSAGE("CORBA::COMM_FAILURE: Naming Service not yet ready, waiting...");
+        {
+          MESSAGE("CORBA::COMM_FAILURE: Naming Service not yet ready, waiting...");
 #ifndef WIN32
           nanosleep(&ts_req,&ts_rem); // wait before retry
 #else
           Sleep(TIMESleep/1000000);
 #endif
-       }
+        }
     }
   if (!found)
     {