killbill-aplcache

payment: fix potential NPE in PaymentOperation This should …

12/15/2014 2:09:57 PM

never happen unless the plugin returns an invalid response.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

Pierre-Alexandre Meyer

Commit: 6fcb24d

Tree: d2ceafa

Parents: 4f73c96

Changes

payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentOperation.java 2(+1 -1)

Details

payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentOperation.java 2(+1 -1)

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentOperation.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentOperation.java
index daf9c67..bc9bfdb 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentOperation.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/PaymentOperation.java
@@ -205,7 +205,7 @@ public abstract class PaymentOperation extends OperationCallbackBase<PaymentTran
     }
 
     private OperationResult processPaymentInfoPlugin() {
-        if (paymentStateContext.getPaymentInfoPlugin() == null) {
+        if (paymentStateContext.getPaymentInfoPlugin() == null || paymentStateContext.getPaymentInfoPlugin().getStatus() == null) {
             return OperationResult.FAILURE;
         }