]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Fixing coverity 18130
authorfca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 16 Jan 2012 13:44:08 +0000 (13:44 +0000)
committerfca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 16 Jan 2012 13:44:08 +0000 (13:44 +0000)
STEER/STEER/AliSurveyToAlignObjs.cxx

index 228a5a7090022d983dea062c405d75f5b1e33a97..cd58e5418c28a2d1d6359442f06facdaa68f818f 100644 (file)
@@ -34,14 +34,14 @@ ClassImp(AliSurveyToAlignObjs)
 //________________________________________________________________________
 AliSurveyToAlignObjs::AliSurveyToAlignObjs() :
   TObject(),
-  fSurveyObj(NULL),
+  fSurveyObj(new AliSurveyObj()),
   fSurveyPoints(NULL),
-  fAlignObjArray(NULL),
-  fAlignObj(0){
+  fAlignObjArray(new TClonesArray("AliAlignObjParams",10)),
+  fAlignObj(0)
+{
   //
   //  default constructor
-  fSurveyObj = new AliSurveyObj();
-  fAlignObjArray = new TClonesArray("AliAlignObjParams",10);
+  //
 }   
 
 //_________________________________________________________________________
@@ -59,22 +59,27 @@ AliSurveyToAlignObjs::AliSurveyToAlignObjs(const AliSurveyToAlignObjs &s2aObj) :
 AliSurveyToAlignObjs & AliSurveyToAlignObjs::operator= (const AliSurveyToAlignObjs &s2aObj) {
   //
   // assignment operator
-  fSurveyObj = s2aObj.fSurveyObj;
-  fSurveyPoints = s2aObj.fSurveyPoints;
-  fAlignObjArray = s2aObj.fAlignObjArray;
-  fAlignObj = s2aObj.fAlignObj;
-  return (*this);
+  //
+  if(this != &s2aObj) {
+    TObject::operator(s2aObj);
+    fSurveyObj = s2aObj.fSurveyObj;
+    fSurveyPoints = s2aObj.fSurveyPoints;
+    fAlignObjArray = s2aObj.fAlignObjArray;
+    fAlignObj = s2aObj.fAlignObj;
+  }
+  return *this;
 }
 
 //__________________________________________________________________________
-AliSurveyToAlignObjs::~AliSurveyToAlignObjs() {
+AliSurveyToAlignObjs::~AliSurveyToAlignObjs() 
+{
   //
   // destructor
   //
-  if(fSurveyObj) delete fSurveyObj;
-  if(fSurveyPoints) delete fSurveyPoints;
-  if(fAlignObjArray) delete fAlignObjArray;
-  if(fAlignObj) delete fAlignObj;
+  delete fSurveyObj;
+  delete fSurveyPoints;
+  delete fAlignObjArray;
+  delete fAlignObj;
 }
 
 //__________________________________________________________________________