From 4d4b619b8cb7fdca7e203d26dc408cad24aa76ca Mon Sep 17 00:00:00 2001 From: randomdan Date: Thu, 26 Sep 2013 15:48:37 +0000 Subject: Don't bypass rowReadyInternal for row processor caches and tests --- project2/common/rowProcessor.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/project2/common/rowProcessor.cpp b/project2/common/rowProcessor.cpp index 26ca433..7ffaf7f 100644 --- a/project2/common/rowProcessor.cpp +++ b/project2/common/rowProcessor.cpp @@ -45,16 +45,17 @@ RowProcessor::execute(ExecContext * ec, const RowProcessorCallback & cb) const if (const SourceObject * so = dynamic_cast(this)) { ScopeObject onComplete(boost::bind(&SourceObject::send, so, Complete)); } + const auto rowReadyCallback = boost::bind(&RowProcessor::rowReadyInternal, this, _1, cb, ec); if (IRSE) { try { - source->execute(filter, cb, ec); + source->execute(filter, rowReadyCallback, ec); } catch (const std::exception & e) { Logger()->messagebf(LOG_WARNING, "Source '%s' failed with '%s'", source->name, e.what()); } } else { - source->execute(filter, cb, ec); + source->execute(filter, rowReadyCallback, ec); } } -- cgit v1.2.3