composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

#1039 Continuation of the fix implemented in [3465] that introduced a stopper regression (Fatal Error)

Browse Source 
SVN:trunk[3472]
This commit is contained in:
Romain Quetiez
2014-12-16 13:54:40 +00:00
parent 83e2974b10
commit a7f7424e54
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
synchro/synchro_import.php
View File

@@ -468,7 +468,7 @@ try
// Prepare insert columns
$sInsertColumns = '`'.implode('`, `', $aInputColumns).'`';
$oMutex = new iTopMutex('synchro_import_'.$oDataSource->GetKey().'_'.$oConfig->GetDBName().'_'.$oConfig->GetDBSubname());
$oMutex = new iTopMutex('synchro_import_'.$oDataSource->GetKey().'_'.MetaModel::GetConfig()->GetDBName().'_'.MetaModel::GetConfig()->GetDBSubname());
$oMutex->Lock();
foreach($aData as $iRow => $aRow)
{

2
synchro/synchrodatasource.class.inc.php
View File

@@ -2415,7 +2415,7 @@ class SynchroExecution
self::$m_oCurrentTask = $this->m_oDataSource;
$oMutex = new iTopMutex('synchro_process_'.$this->m_oDataSource->GetKey().'_'.$oConfig->GetDBName().'_'.$oConfig->GetDBSubname());
$oMutex = new iTopMutex('synchro_process_'.$this->m_oDataSource->GetKey().'_'.MetaModel::GetConfig()->GetDBName().'_'.MetaModel::GetConfig()->GetDBSubname());
try
{
$oMutex->Lock();