merging for rebasing

cms-sw · Jul 20, 2016 · edda649 · edda649
2 parents 91fd4dd + b667aa2
commit edda649
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CondTools/L1Trigger/interface/WriterProxy.h b/CondTools/L1Trigger/interface/WriterProxy.h
@@ -76,6 +76,7 @@ class WriterProxyT : public WriterProxy
 	    cond::persistency::TransactionScope tr(session.transaction());
 	    // if throw transaction will unroll
 ///	    tr.start(false);
+
             std::shared_ptr<Type> pointer = std::make_shared<Type>(*(handle.product ()));
 	    std::string payloadToken =  session.storePayload( *pointer );
 ///	    tr.commit();

diff --git a/CondTools/L1Trigger/plugins/L1TriggerKeyListDummyProd.cc b/CondTools/L1Trigger/plugins/L1TriggerKeyListDummyProd.cc
@@ -69,6 +69,7 @@ L1TriggerKeyListDummyProd::produce(const L1TriggerKeyListRcd& iRecord)
    std::shared_ptr<L1TriggerKeyList> pL1TriggerKeyList ;
    pL1TriggerKeyList = std::make_shared< L1TriggerKeyList >() ;
    return pL1TriggerKeyList ;
+//   return std::make_shared< L1TriggerKeyList >() ;
 }
 
 //define this as a plug-in