You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/30 04:39:56 UTC
[30/45] git commit: add comments
add comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/25e36e69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/25e36e69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/25e36e69
Branch: refs/heads/key-row-sharding
Commit: 25e36e69cfe9911eb385546b5042864fd3a7e69e
Parents: 8bd1ab4
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Oct 29 10:25:39 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Oct 29 10:25:39 2014 -0600
----------------------------------------------------------------------
.../usergrid/persistence/queue/impl/QueueScopeFactoryImpl.java | 2 +-
.../services/notifications/ApplicationQueueManager.java | 6 +++++-
.../usergrid/services/notifications/InactiveDeviceManager.java | 2 +-
.../services/notifications/ProviderAdapterFactory.java | 2 +-
.../apache/usergrid/services/notifications/gcm/GCMAdapter.java | 2 +-
5 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/25e36e69/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/QueueScopeFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/QueueScopeFactoryImpl.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/QueueScopeFactoryImpl.java
index 92ed075..2f8c43f 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/QueueScopeFactoryImpl.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/QueueScopeFactoryImpl.java
@@ -29,7 +29,7 @@ import org.apache.usergrid.persistence.queue.QueueScopeFactory;
import java.util.UUID;
/**
- * Classy class class.
+ * Returns scope for queues.
*/
public class QueueScopeFactoryImpl implements QueueScopeFactory {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/25e36e69/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java
index 11b197c..1058c34 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java
@@ -390,7 +390,11 @@ public class ApplicationQueueManager {
public void stop(){
for(ProviderAdapter adapter : getNotifierMap().values()){
- adapter.stop();
+ try {
+ adapter.stop();
+ }catch (Exception e){
+ LOG.error("failed to stop adapter",e);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/25e36e69/stack/services/src/main/java/org/apache/usergrid/services/notifications/InactiveDeviceManager.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/InactiveDeviceManager.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/InactiveDeviceManager.java
index c54a595..82841d2 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/InactiveDeviceManager.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/InactiveDeviceManager.java
@@ -33,7 +33,7 @@ import java.util.HashMap;
import java.util.Map;
/**
- * Classy class class.
+ * remove inactive devices.
*/
public class InactiveDeviceManager {
private static final Logger LOG = LoggerFactory.getLogger(InactiveDeviceManager.class);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/25e36e69/stack/services/src/main/java/org/apache/usergrid/services/notifications/ProviderAdapterFactory.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ProviderAdapterFactory.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ProviderAdapterFactory.java
index a4022c1..ea42480 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ProviderAdapterFactory.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ProviderAdapterFactory.java
@@ -28,7 +28,7 @@ import org.apache.usergrid.services.notifications.gcm.GCMAdapter;
import java.util.HashMap;
/**
- * Classy class class.
+ * Get valid provideradapters
*/
public class ProviderAdapterFactory {
private static final String[] providers = new String[]{"apple", "google", "noop"};
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/25e36e69/stack/services/src/main/java/org/apache/usergrid/services/notifications/gcm/GCMAdapter.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/gcm/GCMAdapter.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/gcm/GCMAdapter.java
index b65b25a..e0b32ee 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/gcm/GCMAdapter.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/gcm/GCMAdapter.java
@@ -43,7 +43,7 @@ public class GCMAdapter implements ProviderAdapter {
private final Notifier notifier;
private EntityManager entityManager;
- private Map<Notifier, Batch> notifierBatches = new HashMap<Notifier, Batch>();
+ private Map<Notifier, Batch> notifierBatches = new HashMap<>();
public GCMAdapter(EntityManager entityManager,Notifier notifier){
this.notifier = notifier;