checking if the QA data object inherits from TH1 rather than isA during Checking

[u/mrichter/AliRoot.git] / STEER / AliESDfriend.cxx

diff --git a/STEER/AliESDfriend.cxx b/STEER/AliESDfriend.cxx
index 1d54c9b9f403e807bf4dff72245260c2c3648fd9..0bf592586862c5aedc4990a94f31925614ca8eae 100644 (file)
--- a/STEER/AliESDfriend.cxx
+++ b/STEER/AliESDfriend.cxx
@@ -35,7 +35,7 @@ AliESDfriend::AliESDfriend(): TObject(), fTracks("AliESDfriendTrack",15000),
 AliESDfriend::AliESDfriend(const AliESDfriend &f) :
   TObject(f),
   fTracks(f.fTracks),
-  fESDVZEROfriend(new AliESDVZEROfriend(*f.fESDVZEROfriend))
+  fESDVZEROfriend(f.fESDVZEROfriend ? new AliESDVZEROfriend(*f.fESDVZEROfriend) : NULL)
 {
  //
  // Copy constructor
@@ -49,7 +49,9 @@ AliESDfriend& AliESDfriend::operator=(const AliESDfriend& esd)
     if(&esd == this) return *this;
     TObject::operator=(esd);
     fTracks = esd.fTracks;
-    fESDVZEROfriend = esd.fESDVZEROfriend;
+
+    delete fESDVZEROfriend; fESDVZEROfriend = NULL;
+    if (!esd.fESDVZEROfriend) fESDVZEROfriend = new AliESDVZEROfriend(*esd.fESDVZEROfriend);
 
     return *this;
 }