usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [52/52] [abbrv] git commit: Fixed notification errors
Date Wed, 03 Sep 2014 22:11:47 GMT
Fixed notification errors


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/cb668d2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/cb668d2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/cb668d2a

Branch: refs/heads/two-dot-o-push-notifications
Commit: cb668d2a2f4f9c814084d5ee8f62ffa85b717d5f
Parents: 1d8dd2f
Author: grey <greyes@apigee.com>
Authored: Wed Sep 3 15:02:48 2014 -0700
Committer: grey <greyes@apigee.com>
Committed: Wed Sep 3 15:02:48 2014 -0700

----------------------------------------------------------------------
 .../usergrid/services/notifications/NotificationBatchJob.java   | 5 +++++
 .../apache/usergrid/services/notifications/NotificationJob.java | 3 +++
 .../services/notifications/NotificationsQueueManager.java       | 2 +-
 .../usergrid/services/notifications/NotificationsService.java   | 2 +-
 .../org/apache/usergrid/services/notifications/QueueJob.java    | 4 ++++
 5 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cb668d2a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationBatchJob.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationBatchJob.java
b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationBatchJob.java
index 05fd360..b9ea73e 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationBatchJob.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationBatchJob.java
@@ -122,4 +122,9 @@ public class NotificationBatchJob implements Job {
         logger.info( "execute NotificationBatch completed normally" );
     }
 
+
+    @Override
+    public void dead( final JobExecution execution ) throws Exception {
+
+    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cb668d2a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationJob.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationJob.java
b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationJob.java
index 4cf8c2f..35051bc 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationJob.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationJob.java
@@ -125,5 +125,8 @@ public class NotificationJob extends OnlyOnceJob {
     }
 
 
+    @Override
+    public void dead( final JobExecution execution ) throws Exception {
 
+    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cb668d2a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsQueueManager.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsQueueManager.java
b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsQueueManager.java
index f36a3de..8a15090 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsQueueManager.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsQueueManager.java
@@ -98,7 +98,7 @@ public class NotificationsQueueManager implements NotificationServiceProxy
{
                     Query query = new Query();
                     query.setCollection("notifiers");
                     query.setLimit(100);
-                    PathQuery<Notifier> pathQuery = new PathQuery<Notifier>(em.getApplicationRef(),
query);
+                    PathQuery<Notifier> pathQuery = new PathQuery<Notifier>((SimpleEntityRef)em.getApplicationRef(),
query);
                     Iterator<Notifier> notifierIterator = pathQuery.iterator(em);
                     while (notifierIterator.hasNext()) {
                         Notifier notifier = notifierIterator.next();

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cb668d2a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
index ae289ed..e347f98 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
@@ -157,7 +157,7 @@ public class NotificationsService extends AbstractCollectionService {
             query.setCollection(collection);
 
             if (pathQuery == null) {
-                pathQuery = new PathQuery(em.getApplicationRef(), query);
+                pathQuery = new PathQuery((SimpleEntityRef)em.getApplicationRef(), query);
             } else {
                 pathQuery = pathQuery.chain(query);
             }

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cb668d2a/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueJob.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueJob.java
b/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueJob.java
index e34c816..9f756a4 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueJob.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueJob.java
@@ -124,4 +124,8 @@ public class QueueJob extends OnlyOnceJob {
     }
 
 
+    @Override
+    public void dead( final JobExecution execution ) throws Exception {
+
+    }
 }


Mime
View raw message