Merge the final state of the MERGE_MULTIPR_EVOLUTION

diff --git a/bin/runSalome.py b/bin/runSalome.py
index 86a25107538ae3a79f3852866b044680277fc72c..d4ddabe89f3934ff40f75d2cf889f5751f62c7b4 100755 (executable)
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -765,8 +765,12 @@ def searchFreePort(args, save_config=1):
             f = open(os.environ['OMNIORB_CONFIG'], "w")
             import CORBA
             if CORBA.ORB_ID == "omniORB4":
+                initref += "\ngiopMaxMsgSize = 2097152000  # 2 GBytes";
+                initref += "\ntraceLevel = 0 # critical errors only";
                 f.write("InitRef = %s\n"%(initref))
             else:
+                initref += "\nORBgiopMaxMsgSize = 2097152000  # 2 GBytes";
+                initref += "\nORBtraceLevel = 0 # critical errors only";
                 f.write("ORBInitRef %s\n"%(initref))
                 pass
             f.close()

diff --git a/src/SALOMEDS/SALOMEDS_Client.cxx b/src/SALOMEDS/SALOMEDS_Client.cxx
index c100e89750a9fd304b1f967ddbf22da74feb4e1a..dfe922beb318ba1dede1bdea1f9c594365ddbcb0 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Client.cxx
+++ b/src/SALOMEDS/SALOMEDS_Client.cxx
@@ -282,11 +282,9 @@ 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) ;
+    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "omniORB4" ) ;
 #else
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "omniORB3");
-    omniORB::MaxMessageSize(100 * 1024 * 1024);
+    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "omniORB3" );
 #endif
     
     // Obtain a reference to the root POA.

diff --git a/src/SALOMEDS/SALOMEDS_Server.cxx b/src/SALOMEDS/SALOMEDS_Server.cxx
index 397f397723a3de14065d65e8d7a93dea2a632408..b2d2dd913e172c59f1aa019a8e90543e2a7a84ab 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_Server.cxx
+++ b/src/SALOMEDS/SALOMEDS_Server.cxx
@@ -56,11 +56,9 @@ int main(int argc, char** argv)
     {
       // 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) ;
+      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "omniORB4" ) ;
 #else
-      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "omniORB3");
-      omniORB::MaxMessageSize(100 * 1024 * 1024);
+      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "omniORB3" );
 #endif      
       // Obtain a reference to the root POA.
       long TIMESleep = 500000000;

diff --git a/src/Utils/Utils_ORB_INIT.cxx b/src/Utils/Utils_ORB_INIT.cxx
index 9fe53556438f3d660b222ce192dce3ba63d4bf71..0a8ddf697a140f8f42e3dce4b9e3f528e316d42d 100644 (file)
--- a/src/Utils/Utils_ORB_INIT.cxx
+++ b/src/Utils/Utils_ORB_INIT.cxx
@@ -55,13 +55,9 @@ CORBA::ORB_var &ORB_INIT::operator() ( int argc , char **argv ) throw( CommExcep
        try
          {
 #if OMNIORB_VERSION >= 4
-           const char* options[][2] = { { "giopMaxMsgSize", "104857600" }, { 0, 0 } };
-           _orb = CORBA::ORB_init( argc , argv , "omniORB4", options) ;
+           _orb = CORBA::ORB_init( argc, argv, "omniORB4" ) ;
 #else
-           _orb = CORBA::ORB_init( argc , argv ) ;
-           //set GIOP message size equal to 50Mb for transferring brep shapes as 
-           //sequence of bytes using C++ streams
-           omniORB::MaxMessageSize(100*1024*1024);
+           _orb = CORBA::ORB_init( argc, argv, "omniORB3" ) ;
 #endif
          }
        catch( const CORBA::Exception &ex )