Merge fixes.

This commit is contained in:
JoelKatz
2013-04-16 11:53:50 -07:00
parent 644d97a332
commit 09e4f6a4fe
8 changed files with 23 additions and 8 deletions

View File

@@ -55,6 +55,12 @@ TER PaymentTransactor::doApply()
return temBAD_AMOUNT;
}
else if (CURRENCY_BAD == uSrcCurrency || CURRENCY_BAD == uDstCurrency)
{
cLog(lsINFO) << "Payment: Malformed transaction: Bad currency.";
return temBAD_CURRENCY;
}
else if (mTxnAccountID == uDstAccountID && uSrcCurrency == uDstCurrency && !bPaths)
{
cLog(lsINFO) << boost::str(boost::format("Payment: Malformed transaction: Redundant transaction: src=%s, dst=%s, src_cur=%s, dst_cur=%s")