killbill-memoizeit

The change should be a no-op but after checking existing code …

6/8/2015 8:06:41 PM

i realized that we always pass null for the lastSuccessPaymentState when this one should not change (The PaymentDao will expect a null value and not update that column)

stephane brossier

Commit: 07fa3c7

Tree: b8fa000

Parents: a2df4ea

Changes

payment/src/main/java/org/killbill/billing/payment/core/janitor/PendingTransactionTask.java 4(+3 -1)

Details

payment/src/main/java/org/killbill/billing/payment/core/janitor/PendingTransactionTask.java 4(+3 -1)

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/janitor/PendingTransactionTask.java b/payment/src/main/java/org/killbill/billing/payment/core/janitor/PendingTransactionTask.java
index 23aa0fa..e63d514 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/janitor/PendingTransactionTask.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/janitor/PendingTransactionTask.java
@@ -63,7 +63,9 @@ final class PendingTransactionTask extends CompletionTaskBase<PaymentTransaction
         final InternalCallContext internalCallContext = internalCallContextFactory.createInternalCallContext(payment.getAccountId(), callContext);
 
         final String newPaymentState = paymentStateMachineHelper.getFailureStateForTransaction(paymentTransaction.getTransactionType());
-        paymentDao.updatePaymentAndTransactionOnCompletion(payment.getAccountId(), payment.getId(), paymentTransaction.getTransactionType(), newPaymentState, payment.getLastSuccessStateName(),
+        final String lastSuccessPaymentState = paymentStateMachineHelper.isSuccessState(newPaymentState) ? newPaymentState : null;
+
+        paymentDao.updatePaymentAndTransactionOnCompletion(payment.getAccountId(), payment.getId(), paymentTransaction.getTransactionType(), newPaymentState, lastSuccessPaymentState,
                                                            paymentTransaction.getId(), TransactionStatus.PAYMENT_FAILURE, paymentTransaction.getProcessedAmount(), paymentTransaction.getProcessedCurrency(),
                                                            paymentTransaction.getGatewayErrorCode(), paymentTransaction.getGatewayErrorMsg(), internalCallContext);