killbill-uncached

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java b/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java
index 0f5375b..a2e6839 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/engine/core/Engine.java
@@ -125,7 +125,7 @@ public class Engine implements EventListener, EntitlementService {
                 }
                 @Override
                 public long getDaoClaimTimeMs() {
-                    return config.getDaoMaxReadyEvents();
+                    return config.getDaoClaimTimeMs();
                 }
             });
         } catch (NotificationQueueAlreadyExists e) {

diff --git a/invoice/src/main/java/com/ning/billing/invoice/notification/DefaultNextBillingDateNotifier.java b/invoice/src/main/java/com/ning/billing/invoice/notification/DefaultNextBillingDateNotifier.java
index 0dd5e3a..5107d71 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/notification/DefaultNextBillingDateNotifier.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/notification/DefaultNextBillingDateNotifier.java
@@ -48,15 +48,15 @@ public class DefaultNextBillingDateNotifier implements  NextBillingDateNotifier 
     private final EntitlementDao entitlementDao;
 
     private NotificationQueue nextBillingQueue;
-	private InvoiceListener listener;
+	private final InvoiceListener listener;
 
     @Inject
-	public DefaultNextBillingDateNotifier(NotificationQueueService notificationQueueService, 
+	public DefaultNextBillingDateNotifier(NotificationQueueService notificationQueueService,
 			InvoiceConfig config, EntitlementDao entitlementDao, InvoiceListener listener){
 		this.notificationQueueService = notificationQueueService;
 		this.config = config;
         this.entitlementDao = entitlementDao;
-        this.listener = listener; 
+        this.listener = listener;
 	}
 
     @Override
@@ -97,7 +97,7 @@ public class DefaultNextBillingDateNotifier implements  NextBillingDateNotifier 
                 }
                 @Override
                 public long getDaoClaimTimeMs() {
-                    return config.getDaoMaxReadyEvents();
+                    return config.getDaoClaimTimeMs();
                 }
             });
         } catch (NotificationQueueAlreadyExists e) {
@@ -121,5 +121,5 @@ public class DefaultNextBillingDateNotifier implements  NextBillingDateNotifier 
         listener.handleNextBillingDateEvent(subscriptionId, eventDateTime);
     }
 
- 
+
 }

diff --git a/util/src/main/java/com/ning/billing/util/notificationq/NotificationQueueBase.java b/util/src/main/java/com/ning/billing/util/notificationq/NotificationQueueBase.java
index cc1ea28..a4f4c97 100644
--- a/util/src/main/java/com/ning/billing/util/notificationq/NotificationQueueBase.java
+++ b/util/src/main/java/com/ning/billing/util/notificationq/NotificationQueueBase.java
@@ -182,6 +182,11 @@ public abstract class NotificationQueueBase implements NotificationQueue {
         waitForNotificationStartCompletion();
     }
 
+    @Override
+    public String toString() {
+        return getFullQName();
+    }
+
     private void completedQueueStop() {
     	synchronized (this) {
     		stoppedComplete = true;