Add some delay in node.js tests and fix some NPEs around notifications.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/0eda1b68 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/0eda1b68 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/0eda1b68 Branch: refs/heads/master Commit: 0eda1b68315474f609421a3ad124b3423787754f Parents: f69e4f6 Author: Michael Russo <[email protected]> Authored: Fri Feb 26 16:31:32 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Fri Feb 26 16:31:32 2016 -0800 ---------------------------------------------------------------------- .../apache/usergrid/services/notifications/TaskManager.java | 8 +++++++- .../notifications/impl/ApplicationQueueManagerImpl.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/0eda1b68/stack/services/src/main/java/org/apache/usergrid/services/notifications/TaskManager.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/TaskManager.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/TaskManager.java index 950447a..3e78210 100644 --- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/TaskManager.java +++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/TaskManager.java @@ -124,7 +124,13 @@ public class TaskManager { * passed one w/ the UUID */ private void saveReceipt(EntityRef notification, EntityRef device, Receipt receipt, boolean hasError) throws Exception { - if (this.notification.getDebug() || hasError) { + + boolean debug = false; + if(this.notification != null){ + debug = this.notification.getDebug(); + } + + if ( debug || hasError) { if (receipt.getUuid() == null) { Receipt savedReceipt = em.create(receipt); receipt.setUuid(savedReceipt.getUuid()); http://git-wip-us.apache.org/repos/asf/usergrid/blob/0eda1b68/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java index d0f8ca8..12a47b6 100644 --- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java +++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/impl/ApplicationQueueManagerImpl.java @@ -270,7 +270,7 @@ public class ApplicationQueueManagerImpl implements ApplicationQueueManager { Notification notification = notificationMap.get(message.getNotificationId()); if (notification == null) { notification = em.get(message.getNotificationId(), Notification.class); - notificationMap.put(message.getNotificationId(), notification); + notificationMap.putIfAbsent(message.getNotificationId(), notification); } TaskManager taskManager = taskMap.get(message.getNotificationId()); if (taskManager == null) {
