From: apo <apo@opencascade.com>
Date: Fri, 26 Oct 2007 13:19:17 +0000 (+0000)
Subject: To provide ability to handle big files (up to 2 GBytes)
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d187d21c76eb53115ff5b3a2d683aacc53f6c041;p=modules%2Fkernel.git

To provide ability to handle big files (up to 2 GBytes)
---

diff --git a/bin/launchSalome.py b/bin/launchSalome.py
index c8fe7d52e..08aea588a 100755
--- a/bin/launchSalome.py
+++ b/bin/launchSalome.py
@@ -59,7 +59,6 @@ if freePort < 0 :
     
 else :
     omniCfgFileContent = "InitRef = NameService=corbaname::" + str(hostName) + ":" + str(freePort);
-    omniCfgFileContent += "\ngiopMaxMsgSize = 2097152000  # 2 GBytes";
     omniCfgFilePath = os.environ.get('HOME') + "/" + ".omniORB_" + str(hostName) + "_" + str(freePort) + ".cfg";
 
     omni_file = file(omniCfgFilePath,'w+');
diff --git a/bin/runSalome.py b/bin/runSalome.py
index c59046cc8..89cf14b67 100755
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -762,8 +762,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 c100e8975..dfe922beb 100644
--- 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 397f39772..b2d2dd913 100644
--- 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 9fe535564..0a8ddf697 100644
--- 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 )