Skip to content

Commit

Permalink
#1039 Continuation of the fix implemented in [3465] that introduced a…
Browse files Browse the repository at this point in the history
… stopper regression (Fatal Error)

SVN:trunk[3472]
  • Loading branch information
rquetiez committed Dec 16, 2014
1 parent 83e2974 commit a7f7424
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion synchro/synchro_import.php
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ public function add_comment($sText)
// 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)
{
Expand Down
2 changes: 1 addition & 1 deletion synchro/synchrodatasource.class.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -2415,7 +2415,7 @@ public function Process()

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();
Expand Down

0 comments on commit a7f7424

Please sign in to comment.