bugfix: wrong index was used in FindHandlerDescription -> data blocks occasionally...
authorrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 19 Jul 2008 22:02:37 +0000 (22:02 +0000)
committerrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 19 Jul 2008 22:02:37 +0000 (22:02 +0000)
HLT/BASE/AliHLTOUT.cxx

index 4c8b000..292539b 100644 (file)
@@ -117,7 +117,7 @@ int AliHLTOUT::FindAndSelectDataBlock()
   while (fCurrent<fBlockDescList.size() && iResult==-ENOENT) {
     if (fBlockDescList[fCurrent]==fSearchDataType &&
        (fSearchSpecification==kAliHLTVoidDataSpec || fBlockDescList[fCurrent]==fSearchSpecification) &&
-       (fSearchHandlerType==AliHLTModuleAgent::kUnknownOutput || FindHandlerDesc(fBlockDescList[fCurrent].GetIndex())==fSearchHandlerType) &&
+       (fSearchHandlerType==AliHLTModuleAgent::kUnknownOutput || FindHandlerDesc(fCurrent)==fSearchHandlerType) &&
        (!CheckStatusFlag(kBlockSelection) || fBlockDescList[fCurrent].IsSelected()) &&
        (!CheckStatusFlag(kSkipProcessed) || !fBlockDescList[fCurrent].IsProcessed())) {
       iResult=fBlockDescList[fCurrent].GetIndex();
@@ -159,13 +159,13 @@ int AliHLTOUT::GetDataBlockDescription(AliHLTComponentDataType& dt, AliHLTUInt32
 const AliHLTOUT::AliHLTOUTHandlerListEntry& AliHLTOUT::GetDataBlockHandlerDesc()
 {
   // see header file for class documentation
-  return FindHandlerDesc(GetDataBlockIndex());
+  return FindHandlerDesc(fCurrent);
 }
 
 AliHLTModuleAgent::AliHLTOUTHandlerType AliHLTOUT::GetDataBlockHandlerType()
 {
   // see header file for class documentation
-  AliHLTModuleAgent::AliHLTOUTHandlerDesc desc=FindHandlerDesc(GetDataBlockIndex());
+  AliHLTModuleAgent::AliHLTOUTHandlerDesc desc=FindHandlerDesc(fCurrent);
   AliHLTModuleAgent::AliHLTOUTHandlerType type=desc;
   return type;
 }
@@ -207,7 +207,7 @@ AliHLTModuleAgent* AliHLTOUT::GetAgent()
 {
   // see header file for class documentation
   AliHLTModuleAgent* pAgent=NULL;
-  pAgent=FindHandlerDesc(GetDataBlockIndex());
+  pAgent=FindHandlerDesc(fCurrent);
   return pAgent;
 }
 
@@ -215,7 +215,7 @@ AliHLTOUTHandler* AliHLTOUT::GetHandler()
 {
   // see header file for class documentation
   AliHLTOUTHandler* pHandler=NULL;
-  pHandler=FindHandlerDesc(GetDataBlockIndex());
+  pHandler=FindHandlerDesc(fCurrent);
   return pHandler;
 }