Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not over write CatalogResources for a job on localhost with SalomeLauncher.
[modules/kernel.git]
/
src
/
SALOMEDS
/
SALOMEDS_Study.cxx
diff --git
a/src/SALOMEDS/SALOMEDS_Study.cxx
b/src/SALOMEDS/SALOMEDS_Study.cxx
index 86629e27142cfb4d9cb0a410b318bbf2327ff5ff..2a14971d7f632ed0283c3130f02e220456d8bd80 100644
(file)
--- a/
src/SALOMEDS/SALOMEDS_Study.cxx
+++ b/
src/SALOMEDS/SALOMEDS_Study.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-70,6
+70,9
@@
SALOMEDS_Study::SALOMEDS_Study(SALOMEDSImpl_Study* theStudy)
_isLocal = true;
_local_impl = theStudy;
_corba_impl = SALOMEDS::Study::_nil();
_isLocal = true;
_local_impl = theStudy;
_corba_impl = SALOMEDS::Study::_nil();
+
+ pthread_mutex_init( &SALOMEDS_StudyBuilder::_remoteBuilderMutex, 0 );
+
InitORB();
}
InitORB();
}
@@
-81,7
+84,9
@@
SALOMEDS_Study::SALOMEDS_Study(SALOMEDS::Study_ptr theStudy)
long pid = (long)getpid();
#endif
long pid = (long)getpid();
#endif
- long addr = theStudy->GetLocalImpl(Kernel_Utils::GetHostname().c_str(), pid, _isLocal);
+ pthread_mutex_init( &SALOMEDS_StudyBuilder::_remoteBuilderMutex, 0 );
+
+ CORBA::LongLong addr = theStudy->GetLocalImpl(Kernel_Utils::GetHostname().c_str(), pid, _isLocal);
if(_isLocal) {
_local_impl = reinterpret_cast<SALOMEDSImpl_Study*>(addr);
_corba_impl = SALOMEDS::Study::_duplicate(theStudy);
if(_isLocal) {
_local_impl = reinterpret_cast<SALOMEDSImpl_Study*>(addr);
_corba_impl = SALOMEDS::Study::_duplicate(theStudy);
@@
-125,7
+130,7
@@
bool SALOMEDS_Study::Open(const std::string& theStudyUrl)
{
if(CORBA::is_nil(_corba_impl))
return false;
{
if(CORBA::is_nil(_corba_impl))
return false;
- std::wstring wtheStudyUrl =
std::wstring(theStudyUrl.begin(), theStudyUrl.end()
);
+ std::wstring wtheStudyUrl =
Kernel_Utils::decode_s( theStudyUrl
);
if (!_corba_impl->Open( (wchar_t*)wtheStudyUrl.c_str() ) )
return false;
if (!_corba_impl->Open( (wchar_t*)wtheStudyUrl.c_str() ) )
return false;