COMP/CMSDIST/root-5.27.06b-r39139.patch

Index: core/base/inc/TBuffer.h
===================================================================
--- core/base/inc/TBuffer.h     (revision 39138)
+++ core/base/inc/TBuffer.h     (revision 39139)
@@ -112,6 +112,7 @@
    virtual void       SetByteCount(UInt_t cntpos, Bool_t packInVersion = kFALSE)= 0;
 
    virtual Version_t  ReadVersion(UInt_t *start = 0, UInt_t *bcnt = 0, const TClass *cl = 0) = 0;
+   virtual Version_t  ReadVersionForMemberWise(const TClass *cl = 0) = 0;
    virtual UInt_t     WriteVersion(const TClass *cl, Bool_t useBcnt = kFALSE) = 0;
    virtual UInt_t     WriteVersionMemberWise(const TClass *cl, Bool_t useBcnt = kFALSE) = 0;
 
Index: io/io/src/TBufferFile.cxx
===================================================================
--- io/io/src/TBufferFile.cxx   (revision 39138)
+++ io/io/src/TBufferFile.cxx   (revision 39139)
@@ -2692,6 +2692,78 @@
 }
 
 //______________________________________________________________________________
+Version_t TBufferFile::ReadVersionForMemberWise(const TClass *cl)
+{
+   // Read class version from I/O buffer ; to be used when streaming out
+   // memberwise streamed collection where we do not care (not save) about
+   // the byte count and can safely ignore missing streamerInfo (since they
+   // usually indicate empty collections).
+
+   Version_t version;
+
+   // not interested in byte count
+   frombuf(this->fBufCur,&version);
+
+   if (version<=1) {
+      if (version <= 0)  {
+         if (cl) {
+            if (cl->GetClassVersion() != 0) {
+               UInt_t checksum = 0;
+               frombuf(this->fBufCur,&checksum);
+               TStreamerInfo *vinfo = (TStreamerInfo*)cl->FindStreamerInfo(checksum);
+               if (vinfo) {
+                  return vinfo->TStreamerInfo::GetClassVersion(); // Try to get inlining.
+               } else {
+                  // There are some cases (for example when the buffer was stored outside of
+                  // a ROOT file) where we do not have a TStreamerInfo.  If the checksum is
+                  // the one from the current class, we can still assume that we can read
+                  // the data so let use it.
+                  if (checksum==cl->GetCheckSum() || checksum==cl->GetCheckSum(1)) {
+                     version = cl->GetClassVersion();
+                  } else {
+                     // If we can not find the streamerInfo this means that 
+                     // we do not actully need it (the collection is always empty
+                     // in this file), so no need to issue a warning.
+                     return 0;
+                  }
+               }
+            }
+         } else { // of if (cl) {
+            UInt_t checksum = 0;
+            frombuf(this->fBufCur,&checksum);            
+         }
+      }  else if (version == 1 && fParent && ((TFile*)fParent)->GetVersion()<40000 && cl && cl->GetClassVersion() != 0) {
+         // We could have a file created using a Foreign class before
+         // the introduction of the CheckSum.  We need to check
+         if ((!cl->IsLoaded() || cl->IsForeign()) &&
+            cl->GetStreamerInfos()->GetLast()>1 ) {
+
+            const TList *list = ((TFile*)fParent)->GetStreamerInfoCache();
+            const TStreamerInfo *local = (TStreamerInfo*)list->FindObject(cl->GetName());
+            if ( local )  {
+               UInt_t checksum = local->GetCheckSum();
+               TStreamerInfo *vinfo = (TStreamerInfo*)cl->FindStreamerInfo(checksum);
+               if (vinfo) {
+                  version = vinfo->GetClassVersion();
+               } else {
+                  // If we can not find the streamerInfo this means that 
+                  // we do not actully need it (the collection is always empty
+                  // in this file), so no need to issue a warning.
+                  return 0;
+               }
+            }
+            else  {
+               Error("ReadVersion", "Class %s not known to file %s.",
+                 cl->GetName(), ((TFile*)fParent)->GetName());
+               version = 0;
+            }
+         }
+      }
+   }
+   return version;
+}
+
+//______________________________________________________________________________
 UInt_t TBufferFile::WriteVersion(const TClass *cl, Bool_t useBcnt)
 {
    // Write class version to I/O buffer.
Index: io/io/src/TStreamerInfoReadBuffer.cxx
===================================================================
--- io/io/src/TStreamerInfoReadBuffer.cxx       (revision 39138)
+++ io/io/src/TStreamerInfoReadBuffer.cxx       (revision 39139)
@@ -1068,10 +1068,9 @@
                      continue;
                   }
 
-                  UInt_t startDummy, countDummy;
                   Version_t vClVersion = 0; // For vers less than 9, we have to use the current version.
                   if( vers >= 9 ) {
-                     vClVersion = b.ReadVersion( &startDummy, &countDummy, cle->GetCollectionProxy()->GetValueClass() );
+                     vClVersion = b.ReadVersionForMemberWise( cle->GetCollectionProxy()->GetValueClass() );
                   }
 
                   TVirtualCollectionProxy *newProxy = (newClass ? newClass->GetCollectionProxy() : 0);
@@ -1157,10 +1156,9 @@
                   }
                   TVirtualCollectionProxy *oldProxy = oldClass->GetCollectionProxy();
                   TClass *valueClass = oldClass->GetCollectionProxy()->GetValueClass();
-                  UInt_t startDummy, countDummy;
                   Version_t vClVersion = 0; // For vers less than 8, we have to use the current version.
                   if( vers >= 8 ) {
-                     vClVersion = b.ReadVersion( &startDummy, &countDummy, valueClass );
+                     vClVersion = b.ReadVersionForMemberWise( valueClass );
                   }
 
                   if (valueClass == 0) {
Index: io/io/inc/TBufferFile.h
===================================================================
--- io/io/inc/TBufferFile.h     (revision 39138)
+++ io/io/inc/TBufferFile.h     (revision 39139)
@@ -109,6 +109,7 @@
    virtual void       SetByteCount(UInt_t cntpos, Bool_t packInVersion = kFALSE);
 
    virtual Version_t  ReadVersion(UInt_t *start = 0, UInt_t *bcnt = 0, const TClass *cl = 0);
+   virtual Version_t  ReadVersionForMemberWise(const TClass *cl = 0);
    virtual UInt_t     WriteVersion(const TClass *cl, Bool_t useBcnt = kFALSE);
    virtual UInt_t     WriteVersionMemberWise(const TClass *cl, Bool_t useBcnt = kFALSE);

Revision:	1.1
Committed:	Wed Jul 20 15:27:32 2011 UTC (13 years, 9 months ago) by wdd
Branch:	MAIN
CVS Tags:	CMSSW_4_4_5_patch2, CMSSW_4_4_5_patch1, CMSSW_4_4_5, sm120813-44X, CMSSW_4_2_8_SLHChcal6, ecbForCMSSW_4_2_8_SLHChcal6-slc5_amd64_gcc434, CMSSW_4_2_8_SLHChcal5, ecbForCMSSW_4_2_8_SLHChcal5-slc5_amd64_gcc434, CMSSW_4_2_8_SLHCstd2_patch2, CMSSW_4_2_8_SLHCtk3_patch2, CMSSW_4_2_8_SLHChcal2_patch3, daForCMSSW_4_2_8_SLHChcal2_patch3-slc5_amd64_gcc434, ecbForCMSSW_4_2_8_SLHCstd2_patch2-slc5_amd64_gcc434, ecbForCMSSW_4_2_8_SLHCtk3_patch2-slc5_amd64_gcc434, CMSSW_4_2_8_SLHCstd2_patch1, CMSSW_4_2_8_SLHCtk3_patch1, CMSSW_4_2_8_SLHChcal4_patch4, ecbForCMSSW_4_2_8_SLHCtk3_patch1-slc5_amd64_gcc434, ecbForCMSSW_4_2_8_SLHCstd2_patch1-slc5_amd64_gcc434, ecbForCMSSW_4_2_8_SLHChcal4_patch4-slc5_amd64_gcc434, ecbForCMSSW_4_2_8_SLHChcal2_patch3-slc5_amd64_gcc434, CMSSW_4_2_8_SLHChcal4_patch3, daForCMSSW_4_2_8_SLHChcal4_patch3-slc5_amd64_gcc434, ecbForCMSSW_4_2_8_SLHChcal4_patch3-slc5_amd64_gcc434, CMSSW_4_2_8_SLHChcal4_patch2, daForCMSSW_4_2_8_SLHChcal4_patch2-slc5_amd64_gcc434, CMSSW_4_2_8_SLHChcal4_patch1, daForCMSSW_4_2_8_SLHChcal4_patch1-slc5_amd64_gcc434, ecbForCMSSW_4_2_8_SLHChcal4_patch1-slc5_amd64_gcc434, CMSSW_4_2_8_lowpupatch1, daForCMSSW_4_2_8_lpupatch1-slc5_amd64_gcc434, daForCMSSW_4_2_8_lowpupatch1-slc5_amd64_gcc434, CMSSW_4_2_8_patch7, CMSSW_4_2_8_SLHCtk3, CMSSW_4_2_8_SLHChcal4, ecbForCMSSW_4_2_8_SLHChcal4-slc5_amd64_gcc434b, ecbForCMSSW_4_2_8_SLHCtk3-slc5_amd64_gcc434, CMSSW_4_2_9_HLT1_bphpatch4, daForCMSSW_4_2_9_HLT1_bphpatch4-slc5_amd64_gcc434, CMSSW_4_2_8_SLHCstd2, ecbForCMSSW_4_2_8_SLHCstd2-slc5_amd64_gcc434b, ecbForCMSSW_4_2_8_SLHCstd2-slc5_amd64_gcc434, ecbForCMSSW_4_2_8_SLHCstd_patch1-slc5_amd64_gcc434, CMSSW_4_2_9_HLT1_bphpatch3, daForCMSSW_4_2_9_HLT1_bphpatch3-slc5_amd64_gcc434, CMSSW_4_2_8_SLHCtk_patch2, CMSSW_4_2_8_SLHChcal2_patch2, CMSSW_4_2_8_SLHC2_patch2, ecbForCMSSW_4_2_8_SLHCtk_patch2-slc5_amd64_gcc434d, ecbForCMSSW_4_2_8_SLHCtk_patch2-slc5_amd64_gcc434c, ecbForCMSSW_4_2_8_SLHCtk_patch2-slc5_amd64_gcc434b, ecbForCMSSW_4_2_8_SLHC2_patch2-slc5_amd64_gcc434, ecbForCMSSW_4_2_8_SLHCtk_patch2-slc5_amd64_gcc434, ecbForCMSSW_4_2_8_SLHChcal2_patch2-slc5_amd64_gcc434, ecbForCMSSW_4_2_8_SLHChcal4-slc5_amd64_gcc434, CMSSW_4_2_8_SLHCtk2, daForCMSSW_4_2_8_SLHCtk2-slc5_amd64_gcc434, CMSSW_4_2_8_SLHChcal3, CMSSW_4_2_8_SLHCstd, daForCMSSW_4_2_8_SLHChcal3-slc5_amd64_gcc434, daForCMSSW_4_2_8_SLHCstd-slc5_amd64_gcc434, davidlt_20120419_1945-CMSSW_4_2_8_SLHChcal3-gcc434, davidlt_20120419_1841-CMSSW_4_2_8_SLHCstd-gcc434, davidlt_20120419_1841-slc5_amd64_gcc434b, ecbForCMSSW_4_2_8_SLHCtk2-slc5_amd64_gcc434, ecbForCMSSW_4_2_8_SLHChcal3-slc5_amd64_gcc434, ecbForCMSSW_4_2_8_SLHCstd-slc5_amd64_gcc434b, ecbForCMSSW_4_2_8_SLHCstd-slc5_amd64_gcc434, CMSSW_4_2_8_SLHC2_patch1, CMSSW_4_2_8_SLHCtk_patch1, CMSSW_4_2_8_SLHChcal2_patch1, daForCMSSW_4_2_8_SLHC2_patch1-slc5_amd64_gcc434, daForCMSSW_4_2_8_SLHChcal2_patch1-slc5_amd64_gcc434, daForCMSSW_4_2_8_SLHCtk_patch1-slc5_amd64_gcc434, CMSSW_4_2_9_HLT1_bphpatch2, daForCMSSW_4_2_9_HLT1_bphpatch2-slc5_amd64_gcc434, ecbForCMSSW_4_2_8_SLHC2_patch1-slc5_amd64_gcc434, ecbForCMSSW_4_2_8_SLHChcal2_patch1-slc5_amd64_gcc434, ecbFor428slhctkp1, CMSSW_4_2_9_HLT1_bphpatch1, daForCMSSW_4_2_9_HLT1_bphpatch1-slc5_amd64_gcc434, davidlt_20120404_1419-42X-HLT1-bph1, CMSSW_4_4_4-ports, CMSSW_4_4_4, sm20120309, sm20120309-ports, sm20120228-44X-ports, sm20120228-44X, fw20120221-gcc461onl, sm120220-ports, sm120220, CMSSW_4_4_3_patch1-ports, CMSSW_4_4_3_patch1, vs20120215-50X-gcc461-ports, vs20120215-50X, vs20120215-50X-ports, vs20120215-44X, vs20120215-44X-ports, da20120214-50X-ports, da20120214-50X, da20120214-50X-gcc461-ports, CMSSW_5_0_1_patch3-gcc461-ports, CMSSW_5_0_1_patch3, daForCMSSW_5_0_1_patch3b-slc5_amd64_gcc461, daForCMSSW_5_0_1_patch3b-slc5_amd64_gcc434, daForCMSSW_5_0_1_patch3-slc5_amd64_gcc434, ecbForCMSSW_4_2_8_SLHChcal2-slc5_amd64_gcc434, CMSSW_5_0_1_patch2-gcc461-ports, CMSSW_5_0_1_patch2, daForCMSSW_5_0_1_patch2c-slc5_amd64_gcc461, daForCMSSW_5_0_1_patch2c-slc5_amd64_gcc434, daForCMSSW_5_0_1_patch2-slc5_amd64_gcc461, daForCMSSW_5_0_1_patch2b-slc5_amd64_gcc434, daForCMSSW_5_0_1_patch2-slc5_amd64_gcc434, da20120206-50X-gcc461-ports, da20120206-50X, da20120206-50X-ports, da20120205-44X-ports, da20120205-44X, da20120205-50X-gcc461-ports, da20120205-50X-ports, da20120205-50X, fw20120205-cmssw50x-online, CMSSW_5_0_1_ONLINE, CMSSW_4_2_8_SLHCtk, CMSSW_5_0_1_patch1-gcc461-ports, CMSSW_5_0_1_patch1, vskarupeForCMSSW_4_2_8_SLHCtkd, vskarupeForCMSSW_4_2_8_SLHCtkc, da20120201-42X-ports, da20120201-42X, vskarupeForCMSSW_4_2_8_SLHCtkb, vskarupeForCMSSW_4_2_8_SLHCtk, CMSSW_5_0_0_patch2-gcc461-ports, CMSSW_5_0_0_patch2, fw20120202cmssw501online, CMSSW_4_2_8_p7rootfix, fw20120201cmssw501online, ecbFor428slhcstd, daFor428p7rootfix-ports, daFor428p7rootfix, CMSSW_5_0_1-ports, CMSSW_5_0_1-gcc461-ports, CMSSW_5_0_1, da20120129-50X-ports, da20120129-50X, da20120129-50X-gcc461-ports, ecbFor428slhctk, CMSSW_5_0_0_ONLINE-cms, fw20120127gcc461cmssw500onl, ebFor428slhc1p1, fw20120126gcc461cmssw500onl, fw20120125gcc461cmssw500onl, CMSSW_4_4_3-ports, CMSSW_4_4_3, sm120124-ports, da20120123-50X-ports, da20120123-50X, da20120123-50X-gcc461-ports, da20120123-44X-ports, da20120123-44X, CMSSW_5_0_0_patch1-gcc461-ports, CMSSW_5_0_0_patch1, CMSSW_4_4_2_p10JEmalloc, da20120112-50X-ports, da20120112-50X, da20120112-50X-gcc461-ports, CMSSW_5_0_0_ONLINE, da20120110-50X-ports, da20120110-50X, da20120110-50X-gcc461-ports, fw20120110gcc461cmssw500onl, da20120106-52X-ports, da20120106-52X, sm120105onl500, CMSSW_5_0_0_g4emtest, sm111222a-onlgcc461, sm111222-onlgcc461, CMSSW_4_4_2_patch10-ports, CMSSW_4_4_2_patch10, CMSSW_5_0_0-ports, azFor442patch10gcc451, azFor442patch10, da20111220-50X-ports, da20111220-50X, da20111220-50X-gcc461-ports, da20111219-50X-ports, da20111219-50X, da20111219-50X-gcc461-ports, sjgFor500-ports, CMSSW_5_0_0-gcc461-ports, CMSSW_5_0_0, sjgFor500-gcc461-ports, sjgFor500, az20111214-50X-gcc461-ports, az20111214-50X-ports, az20111214-50X, CMSSW_4_2_8_SLHChcal, CMSSW_4_4_2_patch9-ports, CMSSW_4_4_2_patch9, vsFor442patch9gcc451, vsFor442patch9, ecbFor428slhchcal, vs20111213-50X-ports, vs20111213-50X, fwFor500pre7-online, CMSSW_4_4_2_patch8-ports, CMSSW_4_4_2_patch8, CMSSW_5_0_0_pre7pythia424, sjgFor500pre7p424b, sjgFor500pre7p424, CMSSW_5_0_0_pre7, CMSSW_5_0_0_pre7-gcc461-ports, sjgFor500pre7-ports, sjgFor500pre7-gcc461-ports, sjgFor500pre7, da20111206b-50X-gcc461-ports, da20111206-50X-gcc461-ports, da20111202-50X-ports, da20111202-50X-gcc461-ports, da20111202-50X, vs20111201-50X-ports, da20111201f-50X-gcc461-ports, da20111201e-50X-gcc461-ports, vs20111201c-50X, vs20111201temp-50X, da20111201d-50X-gcc461-ports, vs20111201b-50X, da20111201c-50X-gcc461-ports, vs20111201-50X, da20111201c-50X-ports, da20111201b-50X-ports, da20111201b-50X-gcc461-ports, da20111201b-50X, da20111201-50X-gcc461-ports, da20111201-50X, vs20111130-42X-ports, vs20111130-42X, vs20111130-44X-ports, vs20111130-44X, da20111130-50X-ports, da20111130-50X-gcc461-ports, da20111130-50X, CMSSW_4_2_8_SLHC1, CMSSW_4_2_8_SLHC2, CMSSW_5_0_0_pre6g494, da20111128-50X-ports, da20111128-50X-gcc461-ports, da20111128-50X, sjgFor500pre6gcc494, az20111126-50X-gcc461-ports, az20111126-50X-ports, az20111126-50X, sm20111126-50X-gcc461-ports, sm20111126-50X-ports, sm20111126-50X, az20111125-50X-ports, az20111125-50X-gcc461-ports, az20111125-50X, az20111124-50X-ports, az20111124-50X-gcc461-ports, az20111124-50X, az20111123-50X-gcc461-ports, az20111123-50X-ports, az20111123-50X, CMSSW_4_4_2_patch7-ports, CMSSW_4_4_2_patch7, azFor442patch7gcc451, azFor442patch7gcc434, ecbFor428slhc1, CMSSW_5_0_0_pre6, CMSSW_5_0_0_pre6-ports, CMSSW_5_0_0_pre6-gcc461-ports, ecbFor428slhc2, eskFor3XYpreZ, sjgFor500pre6-ports, sjgFor500pre6-gcc461-ports, sjgFor500pre6, sm20111121-50X-gcc461-ports, sm20111121-50X, sm20111121-50X-ports, az20111121-50X-ports, CMSSW_4_4_2_patch6-ports, CMSSW_4_4_2_patch6, az20111118b-50X-gcc461-ports, az20111118b-50X-ports, az20111118-50X-ports, azFor442patch6gcc451, azFor442patch6gcc434, sm20111118-50X-gcc461-ports, az20111117b-50X-gcc461-ports, az20111117b-50X-ports, az20111117b-50X, az20111117-50X-gcc461-ports, az20111117-50X-ports, az20111117-50X, az20111116-50X-gcc461-ports, az20111116-50X-ports, az20111116-50X, CMSSW_4_4_2_onlpatch2_ONLINE, az20111115b-50X-gcc461-ports, az20111115b-50X-ports, az20111115-50X-gcc461-ports, az20111115-50X-ports, sm111115-onlgcc461, az20111115-50X, az20111110-42X-ports, CMSSW_5_0_0_pre5_root532rc1, azFor500pre5r532rc1, az20111111b-50X, az20111111-50X, CMSSW_4_4_2_patch5-ports, CMSSW_4_4_2_patch5, azFor442patch5gcc451, azFor442patch5gcc434, CMSSW_4_4_2_patch4-ports, CMSSW_4_4_2_patch4, azFor442patch4gcc451, azFor442patch4gcc434, az20111110-42X, az20111109b-44X, az20111109b-44X-ports, az20111109-44X-ports, az20111109-44X, CMSSW_4_4_2_patch3-ports, CMSSW_4_4_2_patch3, azFor442patch3gcc451, azFor442patch3gcc434, sjg111108-50X-gcc461-ports, az20111108-50X-gcc461-ports, az20111108-50X-ports, az20111108-50X, CMSSW_4_4_2_patch2-ports, CMSSW_4_4_2_patch2, CMSSW_5_0_0_pre5-ports, CMSSW_5_0_0_pre5, CMSSW_5_0_0_pre5-gcc461-ports, sjgFor500pre5-50X-gcc461-ports, sjgFor500pre5-ports, sjgFor500pre5, CMSSW_4_4_2_patch1-ports, CMSSW_4_4_2_patch1, azFor442patch1gcc451, azFor442patch1gcc434, fwFor500pre4-online, az20111102b-50X-ports, az20111102b-50X-gcc461-ports, az20111102b-50X, az20111102-50X, CMSSW_4_4_2_onlpatch1_ONLINE, CMSSW_4_4_2_ONLINE, az20111031-42X-ports, az20111031-42X, az20111031c-50X-gcc461-ports, az20111031c-50X-ports, az20111031c-50X, az20111031b-50X, az20111031-50X, CMSSW_4_4_2-ports, CMSSW_4_4_2, az20111027c-50X-gcc461-ports, azFor442gcc451, azFor442gcc434, CMSSW_5_0_0_pre4-gcc461-ports, CMSSW_5_0_0_pre4-ports, CMSSW_5_0_0_pre4, az20111027b-50X-gcc461-ports, az20111027b-50X-ports, az20111027b-50X, az20111027-50X-gcc461-ports, az20111027-50X-ports, az20111027-50X, sjgFor500pre4-gcc461-ports, sjgFor500pre4-ports, sjgFor500pre4, az20111026-50X-gcc461-ports, az20111026-50X-ports, az20111026-50X, az20111025-50X-gcc461-ports, az20111025-50X-ports, az20111025-50X, sm20111025-50X-ports, sm20111025-50X-gcc461-ports, sm20111025-50X, CMSSW_4_2_9_HLT3_onlpatch4_ONLINE, az20111024-50X-gcc461-ports, az20111024-50X-ports, az20111024-50X, az20111022-50X, sjg111021c-50X-gcc461-ports, sjg111021b-50X-ports, sjg111021b-50X-gcc461-ports, sjg111021d-50X, sjg111021c-50X, sjg111021-50X-gcc461-ports, sjg111021-50X-ports, sjg111021b-50X, sjg111021-50X, CMSSW_4_2_9_HLT3_onlpatch3_ONLINE, az20111020-50X-gcc461-ports, CMSSW_4_4_0_patch4-ports, CMSSW_4_4_0_patch4, azFor440patch4gcc451, azFor440patch4gcc434, CMSSW_5_0_0_pre3, CMSSW_5_0_0_pre3-gcc461-ports, CMSSW_5_0_0_pre3-ports, sjgFor500pre3-gcc461-ports, sjgFor500pre3-ports, sjgFor500pre3, sjgFor500pre2d-gcc461-ports, sjgFor500pre2c-gcc461-ports, sjgFor500pre2b-gcc461-ports, az20111014b-50X-gcc461-ports, az20111014-50X-ports, az20111014-50X, CMSSW_4_4_1_ONLINE, az20111014-50X-gcc461-ports, CMSSW_4_2_9_HLT3_hltpatch3, CMSSW_4_4_1-ports, CMSSW_4_4_1, sjgFor500pre2-gcc461-ports, az20111012-50X-ports, az20111012-50X, azFor441gcc451, azFor441gcc434, az20111011c-50X-gcc461-ports, az20111011b-50X-gcc461-ports, az20111011b-50X-ports, az20111011b-50X, az20111011a-50X-gcc461-ports, az20111011a-50X-ports, az20111011a-50X, az20111011-50X, az20111010-50X-gcc461-ports, CMSSW_4_2_9_HLT3_onlpatch2_ONLINE, CMSSW_5_0_0_pre2, CMSSW_5_0_0_pre2-ports, sjgFor500pre2-ports, sjgFor500pre2, CMSSW_4_4_0_patch3-ports, CMSSW_4_4_0_patch3, CMSSW_4_2_8_patch6, CMSSW_4_2_8_patch6-ports, azFor440patch3gcc451, azFor440patch3gcc434, az20111007-50X-gcc461-ports, az20111007-50X-ports, az20111007-50X, CMSSW_4_4_0_patch2-ports, CMSSW_4_4_0_patch2, azFor440patch2gcc451, azFor440patch2gcc434, az20111005-50X-gcc461-ports, az20111004a-50X-gcc461-ports, az20111004-50X-gcc461-ports, CMSSW_4_2_9_HLT3_hltpatch1, CMSSW_4_2_9_HLT3_hltpatch2, az20111003-50X-gcc461-ports, CMSSW_4_2_9_HLT3_onlpatch1_ONLINE, CMSSW_4_2_9_HLT3_ONLINE, CMSSW_4_4_0_patch1-ports, CMSSW_4_4_0_patch1, azFor440patch1gcc451a, azFor440patch1gcc434a, azFor440patch1gcc451, azFor440patch1gcc434, CMSSW_4_2_8_patch5-ports, CMSSW_4_2_8_patch5, az20110930a-50X-gcc461-ports, az20110930-50X-gcc461-ports, ge20110930-gcc461-ports, CMSSW_5_0_0_pre1-ports, CMSSW_4_2_9_HLT3-ports, CMSSW_4_2_9_HLT3, az20110929a-50X-gcc461-ports, sjgFor500pre1-ports, az20110929-50X-ports, az20110929-50X-gcc461-ports, ge20110929-gcc461-ports, az20110928a-50X-gcc461-ports, az20110928a-50X-ports, az20110928a-50X, az20110928-50X-gcc461-ports, az20110928-50X-ports, az20110928-50X, az20110928-50X-461-ports, az20110926-50X-ports, az20110926a-50X-gcc461-ports, az20110926-gcc461-ports, ge20110926-gcc461-ports, CMSSW_5_0_0_pre1, sjgFor500pre1b, sjgFor500pre1, az20110922c-50X, ge20110923-gcc461-ports, CMSSW_4_4_0-ports, CMSSW_4_4_0, az20110922c-50X-ports, azFor440gcc451, azFor440gcc434, az20110922b-50X-ports, az20110922b-50X, ge20110922b-gcc461-ports, CMSSW_4_2_9_HLT2_hltpatch1, az20110922a-50X-ports, az20110922a-50X, az20110922-50X, ge20110922-gcc461-ports, ge20110921-gcc461-ports, CMSSW_4_2_9_HLT2_onlpatch1_ONLINE, CMSSW_4_2_9_HLT2_ONLINE, az20110921-44X-ports, az20110921-44X, CMSSW_4_2_9_HLT2, CMSSW_4_2_9_HLT2-ports, az20110920-50X-ports, az20110920-50X, ge20110919-gcc461, az20110918-50X-ports, az20110918-50X, az20110916c-50X-ports, az20110916c-50X, az20110916b-50X, az20110916a-50X, az20110916-50X, CMSSW_4_2_8_patch4-ports, CMSSW_4_2_8_patch4, CMSSW_4_2_9_HLT1_patch1-ports, CMSSW_4_2_9_HLT1_patch1, az20110914-44X-ports, az20110914-44X, ge20110914-gcc461, az20110913-44X-ports, az20110913-44X, az20110912-50X-ports, az20110912-50X, CMSSW_4_2_9_HLT1_ONLINE, az20110912-44X-ports, az20110912-44X, sm20110912-50X-ports, sm20110912-50X, CMSSW_4_4_0_pre10_ONLINE, fwFor440pre10online, CMSSW_4_4_0_pre10-ports, CMSSW_4_4_0_pre10, azFor440pre10gcc451, azFor440pre10gcc434, az20110909b-44X-ports, az20110909b-44X, az20110909a-44X-ports, az20110909a-44X, az20110909-44X-ports, az20110909-44X, az20110908-50X-ports, az20110908-50X, az20110907c-50X, az20110907c-50X-ports, az20110907b-50X, az20110906b-44X, az20110906a-44X, sm20110907-50X-ports, sm20110907-50X, az20110906a-50X-ports, az20110906-44X-ports, az20110906-44X, az20110906-50X-ports, az20110904-50X-ports, az20110904-50X, az20110902b-50X-ports, az20110902b-50X, az20110902a-50X, az20110902-50X-ports, az20110902-50X, CMSSW_4_2_8_patch3-ports, CMSSW_4_2_8_patch3, azFor428patch3gcc451, azFor428patch3gcc434, az20110831-50X-ports, az20110831-50X, CMSSW_4_4_0_pre9, CMSSW_4_4_0_pre9-ports, azFor440pre9gcc451, azFor440pre9gcc434, az20110827-50X-ports, az20110827-50X, CMSSW_4_2_9_HLT1_hltpatch1-ports, CMSSW_4_2_9_HLT1_hltpatch1, az20110826b-50X-ports, az20110826b-50X, az20110826a-50X, az20110826-50X, az20110825-50X-ports, az20110825-50X, az20110823-50X-ports, az20110823-50X, CMSSW_4_2_8_patch2-ports, CMSSW_4_2_8_patch2, az20110821-44X-ports, az20110821-44X, CMSSW_4_2_9_HLT1-ports, CMSSW_4_2_9_HLT1, az20110818a-50X-ports, az20110818a-50X, az20110818-50X-ports, az20110818-50X, CMSSW_4_2_9_HLT-ports, CMSSW_4_2_9_HLT, sm20110816-42X, sm20110816-42X-ports, CMSSW_4_4_0_pre8-ports, CMSSW_4_4_0_pre8, azFor440pre8gcc451, azFor440pre8gcc434, sjg110813b-50X-ports, sjg110813b-50X, sjg110813a-50X-ports, sjg110813a-50X, az20110809b-50X-ports, az20110809b-50X, az20110809a-50X, az20110809a-44X-ports, az20110809a-44X, az20110809-50X-ports, az20110809-50X, az20110809-44X-ports, az20110809-44X, CMSSW_4_2_8_patch1-ports, CMSSW_4_2_8_patch1, CMSSW_4_4_0_pre7_g494p02-ports, CMSSW_4_4_0_pre7_g494p02, azFor440p7g494p02-g451, azFor440p7g494p02, az20110804-44X-ports, az20110804-44X, sjg110804-50X-ports, sjg110804-50X, sjg110803-50X-ports, sjg110803-50X, az20110802-42X-ports, az20110802-42X, CMSSW_4_4_0_pre7-ports, CMSSW_4_4_0_pre7, azFor440pre7gcc451, azFor440pre7gcc434, az20110801-44X, az20110801-44X-ports, CMSSW_4_4_0_pre6-ports, CMSSW_4_4_0_pre6, azFor440pre6gcc451, azFor440pre6gcc434, az20110729-44X-ports, az20110729-44X, CMSSW_4_2_8-ports, CMSSW_4_2_8, azFor428gcc451, azFor428gcc434, DBS_2_1_6-pre1, az20110726a-44X-ports, az20110726a-44X, az20110726-44X-ports, az20110726-44X, az20110725c-44X-ports, az20110725c-44X, az20110725b-44X-ports, az20110725b-44X, az20110725a-44X-ports, az20110725-44X-ports, az20110725a-44X, az20110725-44X, az20110720-42X-ports, az20110720-42X
Log Message:	new patch related to a bug triggered by reading back an empty container while the C++ code has evolved
#	Content
1	Index: core/base/inc/TBuffer.h
2	===================================================================
3	--- core/base/inc/TBuffer.h (revision 39138)
4	+++ core/base/inc/TBuffer.h (revision 39139)
5	@@ -112,6 +112,7 @@
6	virtual void SetByteCount(UInt_t cntpos, Bool_t packInVersion = kFALSE)= 0;
7
8	virtual Version_t ReadVersion(UInt_t start = 0, UInt_t bcnt = 0, const TClass *cl = 0) = 0;
9	+ virtual Version_t ReadVersionForMemberWise(const TClass *cl = 0) = 0;
10	virtual UInt_t WriteVersion(const TClass *cl, Bool_t useBcnt = kFALSE) = 0;
11	virtual UInt_t WriteVersionMemberWise(const TClass *cl, Bool_t useBcnt = kFALSE) = 0;
12
13	Index: io/io/src/TBufferFile.cxx
14	===================================================================
15	--- io/io/src/TBufferFile.cxx (revision 39138)
16	+++ io/io/src/TBufferFile.cxx (revision 39139)
17	@@ -2692,6 +2692,78 @@
18	}
19
20	//______________________________________________________________________________
21	+Version_t TBufferFile::ReadVersionForMemberWise(const TClass *cl)
22	+{
23	+ // Read class version from I/O buffer ; to be used when streaming out
24	+ // memberwise streamed collection where we do not care (not save) about
25	+ // the byte count and can safely ignore missing streamerInfo (since they
26	+ // usually indicate empty collections).
27	+
28	+ Version_t version;
29	+
30	+ // not interested in byte count
31	+ frombuf(this->fBufCur,&version);
32	+
33	+ if (version<=1) {
34	+ if (version <= 0) {
35	+ if (cl) {
36	+ if (cl->GetClassVersion() != 0) {
37	+ UInt_t checksum = 0;
38	+ frombuf(this->fBufCur,&checksum);
39	+ TStreamerInfo vinfo = (TStreamerInfo)cl->FindStreamerInfo(checksum);
40	+ if (vinfo) {
41	+ return vinfo->TStreamerInfo::GetClassVersion(); // Try to get inlining.
42	+ } else {
43	+ // There are some cases (for example when the buffer was stored outside of
44	+ // a ROOT file) where we do not have a TStreamerInfo. If the checksum is
45	+ // the one from the current class, we can still assume that we can read
46	+ // the data so let use it.
47	+ if (checksum==cl->GetCheckSum() \|\| checksum==cl->GetCheckSum(1)) {
48	+ version = cl->GetClassVersion();
49	+ } else {
50	+ // If we can not find the streamerInfo this means that
51	+ // we do not actully need it (the collection is always empty
52	+ // in this file), so no need to issue a warning.
53	+ return 0;
54	+ }
55	+ }
56	+ }
57	+ } else { // of if (cl) {
58	+ UInt_t checksum = 0;
59	+ frombuf(this->fBufCur,&checksum);
60	+ }
61	+ } else if (version == 1 && fParent && ((TFile*)fParent)->GetVersion()<40000 && cl && cl->GetClassVersion() != 0) {
62	+ // We could have a file created using a Foreign class before
63	+ // the introduction of the CheckSum. We need to check
64	+ if ((!cl->IsLoaded() \|\| cl->IsForeign()) &&
65	+ cl->GetStreamerInfos()->GetLast()>1 ) {
66	+
67	+ const TList list = ((TFile)fParent)->GetStreamerInfoCache();
68	+ const TStreamerInfo local = (TStreamerInfo)list->FindObject(cl->GetName());
69	+ if ( local ) {
70	+ UInt_t checksum = local->GetCheckSum();
71	+ TStreamerInfo vinfo = (TStreamerInfo)cl->FindStreamerInfo(checksum);
72	+ if (vinfo) {
73	+ version = vinfo->GetClassVersion();
74	+ } else {
75	+ // If we can not find the streamerInfo this means that
76	+ // we do not actully need it (the collection is always empty
77	+ // in this file), so no need to issue a warning.
78	+ return 0;
79	+ }
80	+ }
81	+ else {
82	+ Error("ReadVersion", "Class %s not known to file %s.",
83	+ cl->GetName(), ((TFile*)fParent)->GetName());
84	+ version = 0;
85	+ }
86	+ }
87	+ }
88	+ }
89	+ return version;
90	+}
91	+
92	+//______________________________________________________________________________
93	UInt_t TBufferFile::WriteVersion(const TClass *cl, Bool_t useBcnt)
94	{
95	// Write class version to I/O buffer.
96	Index: io/io/src/TStreamerInfoReadBuffer.cxx
97	===================================================================
98	--- io/io/src/TStreamerInfoReadBuffer.cxx (revision 39138)
99	+++ io/io/src/TStreamerInfoReadBuffer.cxx (revision 39139)
100	@@ -1068,10 +1068,9 @@
101	continue;
102	}
103
104	- UInt_t startDummy, countDummy;
105	Version_t vClVersion = 0; // For vers less than 9, we have to use the current version.
106	if( vers >= 9 ) {
107	- vClVersion = b.ReadVersion( &startDummy, &countDummy, cle->GetCollectionProxy()->GetValueClass() );
108	+ vClVersion = b.ReadVersionForMemberWise( cle->GetCollectionProxy()->GetValueClass() );
109	}
110
111	TVirtualCollectionProxy *newProxy = (newClass ? newClass->GetCollectionProxy() : 0);
112	@@ -1157,10 +1156,9 @@
113	}
114	TVirtualCollectionProxy *oldProxy = oldClass->GetCollectionProxy();
115	TClass *valueClass = oldClass->GetCollectionProxy()->GetValueClass();
116	- UInt_t startDummy, countDummy;
117	Version_t vClVersion = 0; // For vers less than 8, we have to use the current version.
118	if( vers >= 8 ) {
119	- vClVersion = b.ReadVersion( &startDummy, &countDummy, valueClass );
120	+ vClVersion = b.ReadVersionForMemberWise( valueClass );
121	}
122
123	if (valueClass == 0) {
124	Index: io/io/inc/TBufferFile.h
125	===================================================================
126	--- io/io/inc/TBufferFile.h (revision 39138)
127	+++ io/io/inc/TBufferFile.h (revision 39139)
128	@@ -109,6 +109,7 @@
129	virtual void SetByteCount(UInt_t cntpos, Bool_t packInVersion = kFALSE);
130
131	virtual Version_t ReadVersion(UInt_t start = 0, UInt_t bcnt = 0, const TClass *cl = 0);
132	+ virtual Version_t ReadVersionForMemberWise(const TClass *cl = 0);
133	virtual UInt_t WriteVersion(const TClass *cl, Bool_t useBcnt = kFALSE);
134	virtual UInt_t WriteVersionMemberWise(const TClass *cl, Bool_t useBcnt = kFALSE);
135