-using namespace std;
-//=============================================================================
-// File : Utils_ORB_INIT.cxx
-// Created : lun nov 5 16:04:47 CET 2001
-// Author : Antoine YESSAYAN, EDF
-// Project : SALOME
-// Copyright : EDF 2001
-// $Header$
-//=============================================================================
+// Copyright (C) 2007-2013 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
+//
+// 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
+//
-using namespace std;
+// 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"
+# include "SALOMEconfig.h"
+
ORB_INIT::ORB_INIT( void ): _orb( CORBA::ORB::_nil() )
{
- ;
}
ORB_INIT::~ORB_INIT()
{
- if ( ! CORBA::is_nil( _orb ) )
- {
- MESSAGE("appel _orb->destroy()") ;
- _orb->destroy() ;
- MESSAGE("retour _orb->destroy()") ;
- }
+ 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;
+ /*
+ try {
+ _orb->destroy() ;
+ }
+ catch(...) {
+ MESSAGE("Caught CORBA::Exception.");
+ }
+ */
+ //std::cerr << "retour _orb->destroy()" << std::endl;
+ }
}
CORBA::ORB_var &ORB_INIT::operator() ( int argc , char **argv ) throw( CommException )
{
- if ( CORBA::is_nil( _orb ) )
- {
- try
- {
- _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);
- }
- catch( const CORBA::Exception &ex )
- {
- throw CommException( "Unable to create an ORB connexion" ) ;
- }
- }
- return _orb ;
+ try {
+ if ( CORBA::is_nil( _orb ) )
+ {
+ try
+ {
+#if OMNIORB_VERSION >= 4
+ _orb = CORBA::ORB_init( argc, argv, "omniORB4" ) ;
+#else
+ _orb = CORBA::ORB_init( argc, argv, "omniORB3" ) ;
+#endif
+ }
+ catch( const CORBA::Exception & )
+ {
+ throw CommException( "Unable to create an ORB connexion" ) ;
+ }
+ }
+ return _orb ;
+ } catch ( CommException& e) {throw e;}
+ catch (...) { throw CommException( "ORB_INIT::operator() : Unknown exception was caught" ) ;}
}
