diff options
author | Mark Spruiell <mes@zeroc.com> | 2003-11-20 16:21:06 +0000 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2003-11-20 16:21:06 +0000 |
commit | f1879dc6db3df3645193c58d8319f8d0c85b089f (patch) | |
tree | dd45e615061c64d97b4a0251823398cbfc495044 /cpp/src/Transform/Transformer.cpp | |
parent | OA deadlock fix (diff) | |
download | ice-f1879dc6db3df3645193c58d8319f8d0c85b089f.tar.bz2 ice-f1879dc6db3df3645193c58d8319f8d0c85b089f.tar.xz ice-f1879dc6db3df3645193c58d8319f8d0c85b089f.zip |
open old database with transaction
Diffstat (limited to 'cpp/src/Transform/Transformer.cpp')
-rw-r--r-- | cpp/src/Transform/Transformer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Transform/Transformer.cpp b/cpp/src/Transform/Transformer.cpp index f9a0abbcd4f..c514193f6e1 100644 --- a/cpp/src/Transform/Transformer.cpp +++ b/cpp/src/Transform/Transformer.cpp @@ -346,7 +346,7 @@ public: virtual Slice::UnitPtr newUnit() const; virtual ErrorReporterPtr errorReporter() const; - void transform(const Ice::CommunicatorPtr&, Db*, Db*, bool); + void transform(const Ice::CommunicatorPtr&, Db*, Db*, DbTxn*, bool); private: @@ -1700,12 +1700,12 @@ Transform::TransformerDescriptor::errorReporter() const void Transform::TransformerDescriptor::transform(const Ice::CommunicatorPtr& communicator, Db* db, Db* dbNew, - bool purgeObjects) + DbTxn* txn, bool purgeObjects) { Dbc* dbc = 0; IceInternal::InstancePtr instance = IceInternal::getInstance(communicator); - db->cursor(0, &dbc, 0); + db->cursor(txn, &dbc, 0); communicator->addObjectFactory(new Transform::ObjectFactory(_factory, _old), ""); @@ -2300,7 +2300,7 @@ Transform::Transformer::analyze(ostream& descriptors, Ice::StringSeq& missingTyp } void -Transform::Transformer::transform(istream& is, Db* db, Db* dbNew, ostream& errors) +Transform::Transformer::transform(istream& is, Db* db, Db* dbNew, DbTxn* txn, ostream& errors) { ErrorReporterPtr errorReporter = new ErrorReporter(errors); @@ -2312,7 +2312,7 @@ Transform::Transformer::transform(istream& is, Db* db, Db* dbNew, ostream& error TransformerDescriptorPtr descriptor = dh.descriptor(); descriptor->validate(); - descriptor->transform(_communicator, db, dbNew, _purgeObjects); + descriptor->transform(_communicator, db, dbNew, txn, _purgeObjects); } catch(const IceXML::ParserException& ex) { |