killbill-aplcache

entitlement: fix NPE in EntitlementPluginExecution Signed-off-by:

11/28/2016 5:03:01 PM

Details

diff --git a/entitlement/src/main/java/org/killbill/billing/entitlement/api/EntitlementPluginExecution.java b/entitlement/src/main/java/org/killbill/billing/entitlement/api/EntitlementPluginExecution.java
index 82d9278..0596c73 100644
--- a/entitlement/src/main/java/org/killbill/billing/entitlement/api/EntitlementPluginExecution.java
+++ b/entitlement/src/main/java/org/killbill/billing/entitlement/api/EntitlementPluginExecution.java
@@ -120,7 +120,7 @@ public class EntitlementPluginExecution {
                 continue;
             }
             prevResult = plugin.priorCall(currentContext, currentContext.getPluginProperties());
-            if (prevResult.isAborted()) {
+            if (prevResult != null && prevResult.isAborted()) {
                 break;
             }
             currentContext = new DefaultEntitlementContext(currentContext, prevResult);