killbill-memoizeit

payment: fix NPE in RetryOperationCallback Signed-off-by:

12/15/2014 7:59:38 PM

Details

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryOperationCallback.java b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryOperationCallback.java
index f25fe62..dcad8a0 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryOperationCallback.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/sm/RetryOperationCallback.java
@@ -96,7 +96,7 @@ public abstract class RetryOperationCallback extends OperationCallbackBase<Payme
                 final PriorPaymentRoutingResult pluginResult;
                 try {
                     pluginResult = getPluginResult(retryablePaymentStateContext.getPaymentControlPluginNames(), paymentControlContext);
-                    if (pluginResult.isAborted()) {
+                    if (pluginResult != null && pluginResult.isAborted()) {
                         // Transition to ABORTED
                         return PluginDispatcher.createPluginDispatcherReturnType(OperationResult.EXCEPTION);
                     }