This commit was generated by cvs2git to create branch 'WPdev'.

[modules/kernel.git] / src / SALOMEDS / SALOMEDS_Server.cxx

diff --git a/src/SALOMEDS/SALOMEDS_Server.cxx b/src/SALOMEDS/SALOMEDS_Server.cxx
index 11be220654bbb55fb295c09ec34430591caa1f76..f6c0dc55890c399b1c103aab622ef7aca3c9f3af 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Server.cxx
+++ b/src/SALOMEDS/SALOMEDS_Server.cxx
@@ -26,12 +26,14 @@
 //  Module : SALOME
 //  $Header$
 
-#include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(SALOMEDS)
-#include "SALOMEDS_StudyManager_i.hxx"
 #include "utilities.h"
 #include "Utils_SINGLETON.hxx"
+
 #include "SALOME_NamingService.hxx"
+#include "SALOMEDS_StudyManager_i.hxx"
+
+#include <SALOMEconfig.h>
+#include CORBA_SERVER_HEADER(SALOMEDS)
 
 #ifdef CHECKTIME
 #include <Utils_Timer.hxx>
@@ -53,11 +55,15 @@ int main(int argc, char** argv)
   try 
     {
       // Initialise the ORB.
+#if OMNIORB_VERSION >= 4
+      const char* options[][2] = { { "giopMaxMsgSize", "104857600" }, { 0, 0 } };
+      CORBA::ORB_var orb = CORBA::ORB_init( argc , argv , "omniORB4", options) ;
+#else
       CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "omniORB3");
       omniORB::MaxMessageSize(100 * 1024 * 1024);
+#endif      
       // Obtain a reference to the root POA.
-      //
-      long TIMESleep = 250000000;
+      long TIMESleep = 500000000;
       int NumberOfTries = 40;
       int a;
       timespec ts_req;
@@ -83,7 +89,11 @@ int main(int argc, char** argv)
       for (int i = 1; i<=NumberOfTries; i++)
        {
          if (i!=1) 
+#ifndef WNT
            a=nanosleep(&ts_req,&ts_rem);
+#else
+               Sleep(TIMESleep/1000000);
+#endif
          try
            { 
              obj = orb->resolve_initial_references("RootPOA");
@@ -106,7 +116,11 @@ int main(int argc, char** argv)
                        for(int j=1; j<=NumberOfTries; j++)
                          {
                            if (j!=1) 
+#ifndef WNT
                              a=nanosleep(&ts_req, &ts_rem);
+#else
+                             Sleep(TIMESleep/1000000);
+#endif
                            try
                              {
                                object = inc->resolve(name);
@@ -143,7 +157,7 @@ int main(int argc, char** argv)
       // We allocate the objects on the heap.  Since these are reference
       // counted objects, they will be deleted by the POA when they are no
       // longer needed.    
-      SALOMEDS_StudyManager_i * myStudyManager_i = new  SALOMEDS_StudyManager_i(orb);
+      SALOMEDS_StudyManager_i * myStudyManager_i = new  SALOMEDS_StudyManager_i(orb,poa);
  
       // Activate the objects.  This tells the POA that the objects are
       // ready to accept requests.