Merge branch 'master' into continuousClose

This commit is contained in:
JoelKatz
2012-06-30 16:32:38 -07:00
12 changed files with 182 additions and 86 deletions

View File

@@ -101,7 +101,7 @@ bool TransactionAcquire::takeNodes(const std::list<SHAMapNode>& nodeIDs,
Log(lsWARNING) << "Got root TXS node, already have it";
return false;
}
if (!mMap->addRootNode(getHash(), *nodeDatait))
if (!mMap->addRootNode(getHash(), *nodeDatait, STN_ARF_WIRE))
return false;
else mHaveRoot = true;
}