Index: src/libchcore/TBasePathData.cpp =================================================================== diff -u -N -ra5aa3c3cb78f3767641de2627d1a49a1dc35b429 -r081055369d6b332ef1651877756657973b1b2d9c --- src/libchcore/TBasePathData.cpp (.../TBasePathData.cpp) (revision a5aa3c3cb78f3767641de2627d1a49a1dc35b429) +++ src/libchcore/TBasePathData.cpp (.../TBasePathData.cpp) (revision 081055369d6b332ef1651877756657973b1b2d9c) @@ -114,12 +114,9 @@ m_setModifications.reset(); } -void TBasePathData::InitLoader(const IColumnsDefinitionPtr& spColumnDefs) +void TBasePathData::InitLoader(IColumnsDefinition& rColumnDefs) { - if(!spColumnDefs) - THROW_CORE_EXCEPTION(eErr_InvalidPointer); - - *spColumnDefs % _T("id") % _T("src_path") % _T("skip_processing") % _T("dst_path"); + rColumnDefs % _T("id") % _T("src_path") % _T("skip_processing") % _T("dst_path"); } void TBasePathData::Load(const ISerializerRowReaderPtr& spRowReader) @@ -191,9 +188,9 @@ m_vEntries.clear(); ISerializerRowReaderPtr spRowReader = spContainer->GetRowReader(); - IColumnsDefinitionPtr spColumns = spRowReader->GetColumnsDefinitions(); - if(spColumns->IsEmpty()) - TBasePathData::InitLoader(spRowReader->GetColumnsDefinitions()); + IColumnsDefinition& rColumns = spRowReader->GetColumnsDefinitions(); + if(rColumns.IsEmpty()) + TBasePathData::InitLoader(rColumns); while(spRowReader->Next()) {