killbill-memoizeit

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;

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 6dabd5c..859d106 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/InvoiceDispatcher.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/InvoiceDispatcher.java
@@ -111,7 +111,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();
     private final static Joiner JOINER_COMMA = Joiner.on(",");

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;

diff --git a/util/src/main/java/org/killbill/billing/util/email/templates/MustacheTemplateEngine.java b/util/src/main/java/org/killbill/billing/util/email/templates/MustacheTemplateEngine.java
index b914220..a55c275 100644
--- a/util/src/main/java/org/killbill/billing/util/email/templates/MustacheTemplateEngine.java
+++ b/util/src/main/java/org/killbill/billing/util/email/templates/MustacheTemplateEngine.java
@@ -25,7 +25,7 @@ public class MustacheTemplateEngine implements TemplateEngine {
 
     @Override
     public String executeTemplateText(final String templateText, final Map<String, Object> data) {
-        final Template template = Mustache.compiler().compile(templateText);
+        final Template template = Mustache.compiler().nullValue("").compile(templateText);
         return template.execute(data);
     }
 }