summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrandomdan <randomdan@localhost>2013-09-26 15:48:37 +0000
committerrandomdan <randomdan@localhost>2013-09-26 15:48:37 +0000
commit30bc01e77f17267a2f56d3c0199399d6b9fada12 (patch)
tree793d4dcfe3fde774c4b37f5c7130c65e6e0f58dd
parentAllow instance registration to occur with different key types (diff)
downloadproject2-30bc01e77f17267a2f56d3c0199399d6b9fada12.tar.bz2
project2-30bc01e77f17267a2f56d3c0199399d6b9fada12.tar.xz
project2-30bc01e77f17267a2f56d3c0199399d6b9fada12.zip
Don't bypass rowReadyInternal for row processor caches and tests
-rw-r--r--project2/common/rowProcessor.cpp5
1 files 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<const SourceObject *>(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);
}
}