You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/10/29 20:48:10 UTC
[1/2] git commit: send out final notifications on stop
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o 97ee70fe8 -> 3e1f33dc8
send out final notifications on stop
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7cd722ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7cd722ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7cd722ee
Branch: refs/heads/two-dot-o
Commit: 7cd722ee0b6f3fea990432baed19d4550077fd94
Parents: 77b8c59
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Oct 29 13:47:39 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Oct 29 13:47:39 2014 -0600
----------------------------------------------------------------------
.../usergrid/services/notifications/gcm/GCMAdapter.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7cd722ee/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 36cb7f0..5580ea8 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
@@ -139,7 +139,15 @@ public class GCMAdapter implements ProviderAdapter {
@Override
public void stop() {
-
+ try {
+ synchronized (this) {
+ for (Batch batch : batches.values()) {
+ batch.send();
+ }
+ }
+ }catch (Exception e){
+ LOG.error("error while trying to send on stop",e);
+ }
}
@Override
[2/2] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by sf...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3e1f33dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3e1f33dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3e1f33dc
Branch: refs/heads/two-dot-o
Commit: 3e1f33dc86a7c693fc1e4ab3ab406e3e57229c57
Parents: 7cd722e 97ee70f
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Oct 29 13:48:00 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Oct 29 13:48:00 2014 -0600
----------------------------------------------------------------------
.../corepersistence/CpEntityDeleteListener.java | 45 +++++++------
.../usergrid/corepersistence/CpSetup.java | 1 -
.../usergrid/corepersistence/CpWalker.java | 44 +++++++-----
.../results/FilteringLoader.java | 63 +++++++++--------
.../results/ResultsLoaderFactory.java | 5 +-
.../results/ResultsLoaderFactoryImpl.java | 4 --
.../results/ResultsVerifier.java | 6 +-
.../results/VersionVerifier.java | 8 ++-
.../corepersistence/util/CpEntityMapUtils.java | 5 +-
.../usergrid/persistence/index/EntityIndex.java | 4 +-
.../persistence/index/EntityIndexBatch.java | 6 --
.../persistence/index/EntityIndexFactory.java | 2 -
.../usergrid/persistence/index/IndexScope.java | 9 +--
.../persistence/index/guice/IndexModule.java | 1 -
.../index/impl/EsEntityIndexBatchImpl.java | 3 +-
.../index/impl/EsEntityIndexImpl.java | 71 ++++++++++----------
.../persistence/index/impl/EsProvider.java | 11 ++-
.../index/query/CandidateResults.java | 7 +-
.../persistence/index/query/Identifier.java | 3 +-
.../usergrid/persistence/index/query/Query.java | 27 +++++---
.../persistence/index/query/Results.java | 4 +-
21 files changed, 169 insertions(+), 160 deletions(-)
----------------------------------------------------------------------