killbill-memoizeit

payment: Increment # tries for global lock to match the new the …

9/2/2015 3:13:42 PM

default 100 mSec timeout

We want to at least wait for a 5 sec before the timeout so the value needs to be bumped to 50.

stephane brossier

Commit: a75db15

Tree: 1fdddff

Parents: f3aad9a

Changes

invoice/src/main/java/org/killbill/billing/invoice/api/InvoiceApiHelper.java 3(+2 -1)

invoice/src/main/java/org/killbill/billing/invoice/InvoiceDispatcher.java 5(+4 -1)

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

Details

invoice/src/main/java/org/killbill/billing/invoice/api/InvoiceApiHelper.java 3(+2 -1)

diff --git a/invoice/src/main/java/org/killbill/billing/invoice/api/InvoiceApiHelper.java b/invoice/src/main/java/org/killbill/billing/invoice/api/InvoiceApiHelper.java
index 9506d02..b56af28 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/api/InvoiceApiHelper.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/api/InvoiceApiHelper.java
@@ -57,7 +57,8 @@ public class InvoiceApiHelper {
 
     private static final Logger log = LoggerFactory.getLogger(InvoiceApiHelper.class);
 
-    private static final int NB_LOCK_TRY = 5;
+    // 50 * 100ms = 5sec
+    private static final int NB_LOCK_TRY = 50;
 
     private final InvoicePluginDispatcher invoicePluginDispatcher;
     private final InvoiceDao dao;

invoice/src/main/java/org/killbill/billing/invoice/InvoiceDispatcher.java 5(+4 -1)

diff --git a/invoice/src/main/java/org/killbill/billing/invoice/InvoiceDispatcher.java b/invoice/src/main/java/org/killbill/billing/invoice/InvoiceDispatcher.java
index d229093..ddfa83e 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/InvoiceDispatcher.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/InvoiceDispatcher.java
@@ -113,7 +113,10 @@ import com.google.inject.Inject;
 public class InvoiceDispatcher {
 
     private static final Logger log = LoggerFactory.getLogger(InvoiceDispatcher.class);
-    private static final int NB_LOCK_TRY = 5;
+
+
+    // 50 * 100ms = 5sec
+    private static final int NB_LOCK_TRY = 50;
 
     private static final Ordering<DateTime> UPCOMING_NOTIFICATION_DATE_ORDERING = Ordering.natural();

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

diff --git a/payment/src/main/java/org/killbill/billing/payment/core/ProcessorBase.java b/payment/src/main/java/org/killbill/billing/payment/core/ProcessorBase.java
index e657269..3b76d67 100644
--- a/payment/src/main/java/org/killbill/billing/payment/core/ProcessorBase.java
+++ b/payment/src/main/java/org/killbill/billing/payment/core/ProcessorBase.java
@@ -63,7 +63,8 @@ import com.google.common.collect.Collections2;
 
 public abstract class ProcessorBase {
 
-    public static final int NB_LOCK_TRY = 5;
+    // 50 * 100ms = 5sec
+    public static final int NB_LOCK_TRY = 50;
 
     protected final OSGIServiceRegistration<PaymentPluginApi> pluginRegistry;
     protected final AccountInternalApi accountInternalApi;