Merge from V6_main 28/02/2013

[modules/kernel.git] / src / Utils / Utils_ORB_INIT.cxx

diff --git a/src/Utils/Utils_ORB_INIT.cxx b/src/Utils/Utils_ORB_INIT.cxx
index 7c774711c7bc17834d7189677996ccd993d9ace2..23a9175aedd582c07e0b7e6b741ccecd34629e91 100644 (file)
--- a/src/Utils/Utils_ORB_INIT.cxx
+++ b/src/Utils/Utils_ORB_INIT.cxx
@@ -1,31 +1,31 @@
-//  SALOME Utils : general SALOME's definitions and tools
+// Copyright (C) 2007-2012  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  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 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 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// 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 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
 //
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  SALOME Utils : general SALOME's definitions and tools
 //  File   : Utils_ORB_INIT.cxx
 //  Author : Antoine YESSAYAN, EDF
 //  Module : SALOME
 //  $Header$
-
+//
 # include "Utils_ORB_INIT.hxx" 
 # include "utilities.h" 
 
@@ -40,8 +40,16 @@ ORB_INIT::~ORB_INIT()
 {
   if ( ! CORBA::is_nil( _orb ) )
   {
+    MESSAGE("WARNING: orb destroy is no more called at exit. Use explicit call.");
     //std::cerr << "appel _orb->destroy()" << std::endl;
-    _orb->destroy() ;
+    /*
+    try {
+      _orb->destroy() ;
+    }
+    catch(...) {
+      MESSAGE("Caught CORBA::Exception.");
+    }
+    */
     //std::cerr << "retour _orb->destroy()" << std::endl;
   }
 }
@@ -52,22 +60,18 @@ CORBA::ORB_var &ORB_INIT::operator() ( int argc , char **argv ) throw( CommExcep
   try {
     if ( CORBA::is_nil( _orb ) )
       {
-       try
-         {
+        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 )
-         {
-           throw CommException( "Unable to create an ORB connexion" ) ;
-         }
+          }
+        catch( const CORBA::Exception & )
+          {
+            throw CommException( "Unable to create an ORB connexion" ) ;
+          }
       }
     return _orb ;
   } catch ( CommException& e) {throw e;}