]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
fixing a minor memory leak. Objects from the standard content had been removed from...
authorrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 8 Apr 2010 07:55:39 +0000 (07:55 +0000)
committerrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 8 Apr 2010 07:55:39 +0000 (07:55 +0000)
HLT/global/AliHLTGlobalEsdConverterComponent.cxx

index bc871161da8f94087d4d9c56efd726f0b9c44b88..aa803e49e219ca9be4a584ad771db4f1cad1cb83 100644 (file)
 //* provided "as is" without express or implied warranty.                  *
 //**************************************************************************
 
-/** @file   AliHLTGlobalEsdConverterComponent.cxx
-    @author Matthias Richter
-    @date   
-    @brief  Global ESD converter component.
-*/
+/ @file   AliHLTGlobalEsdConverterComponent.cxx
+//  @author Matthias Richter
+//  @date   
+//  @brief  Global ESD converter component.
+// 
 
 // see header file for class documentation
 // or
@@ -249,31 +249,15 @@ int AliHLTGlobalEsdConverterComponent::DoInit(int argc, const char** argv)
          TObject* pObject=NULL;
          while ((pObject=next())!=NULL) {
            id=((TObjString*)pObject)->GetString().Data();
-           if (fESD->GetList()->FindObject(id)) {
+           TObject* pObj=fESD->GetList()->FindObject(id);
+           if (pObj) {
              HLTDebug("removing object %s", id);
-             fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
+             fESD->GetList()->Remove(pObj);
+             delete pObj;
            } else {
              HLTWarning("failed to remove object '%s' from ESD", id);
            }
          }
-         // id="AliESDRun";           if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="AliESDHeader";        if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="AliESDZDC";           if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="AliESDFMD";           if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="AliESDVZERO";         if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="AliESDTZERO";         if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="TPCVertex";           if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="SPDVertex";           if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="PrimaryVertex";       if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="AliMultiplicity";     if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="PHOSTrigger";         if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="EMCALTrigger";        if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="SPDPileupVertices";   if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="TrkPileupVertices";   if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="Cascades";            if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="Kinks";               if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="AliRawDataErrorLogs"; if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
-         // id="AliESDACORDE";        if (fESD->GetList()->FindObject(id)) fESD->GetList()->Remove(fESD->GetList()->FindObject(id));
          fESD->GetStdContent();
          delete pTokens;
        }