Fixing invalid read error spotted with valgrind (Constantin)

[u/mrichter/AliRoot.git] / OADB / AliOADBFillingScheme.cxx

diff --git a/OADB/AliOADBFillingScheme.cxx b/OADB/AliOADBFillingScheme.cxx
index faca043830e042ee5bbd20440a8c6ba1a4d51d74..7d1755e7c1dca6709bec04bbb7ce96732ce43d45 100644 (file)
--- a/OADB/AliOADBFillingScheme.cxx
+++ b/OADB/AliOADBFillingScheme.cxx
@@ -57,19 +57,19 @@ const char *  AliOADBFillingScheme::GetBXIDs(const char * beamSide) const
 
   if (!strcmp(beamSide, "AC")) {
 
-    TString  bxa =  ((TObjString*)fBXIds->GetValue("A"))->String(); 
-    TString  bxc =  ((TObjString*)fBXIds->GetValue("C"))->String();
-    if(!bxa && !bxc) return "";
-    if(!bxc)         return bxa.Data();
-    if(!bxa)         return bxa.Data();
-    TString bxBoth = bxa.Data();
+    TString  &bxa =  ((TObjString*)fBXIds->GetValue("A"))->String(); 
+    TString  &bxc =  ((TObjString*)fBXIds->GetValue("C"))->String();
+    if(bxa.IsNull() && bxc.IsNull()) return "";
+    if(bxc.IsNull())         return bxa.Data();
+    if(bxa.IsNull())         return bxc.Data();
+    static TString bxBoth = bxa.Data();
     bxBoth += bxc.Data();
     return bxBoth.Data();
 
   } 
 
-  TString  bx =  ((TObjString*)fBXIds->GetValue(beamSide))->String(); 
-  if(!bx) return "";
+  TString  &bx =  ((TObjString*)fBXIds->GetValue(beamSide))->String(); 
+  if(bx.IsNull()) return "";
   return bx.Data();
   
 }