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 2015/11/11 17:49:14 UTC
[1/2] usergrid git commit: fix bug in expiration
Repository: usergrid
Updated Branches:
refs/heads/2.1-release 79452099b -> 204bf0427
fix bug in expiration
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/24600e0b
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/24600e0b
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/24600e0b
Branch: refs/heads/2.1-release
Commit: 24600e0bd17bff9ca022271d780a7e220bfda94e
Parents: 5fd1d5d
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Nov 11 09:48:42 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Nov 11 09:48:42 2015 -0700
----------------------------------------------------------------------
.../apache/usergrid/services/notifications/wns/WNSAdapter.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/24600e0b/stack/services/src/main/java/org/apache/usergrid/services/notifications/wns/WNSAdapter.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/wns/WNSAdapter.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/wns/WNSAdapter.java
index 3ad3d35..f2946df 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/wns/WNSAdapter.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/wns/WNSAdapter.java
@@ -77,8 +77,9 @@ public class WNSAdapter implements ProviderAdapter {
// set the optional TTL value used when pushing notifications
WnsNotificationRequestOptional opt = new WnsNotificationRequestOptional();
- opt.ttl = String.valueOf(notification.getExpireTTLSeconds());
-
+ if(notification.getExpireTTLSeconds()>0) {
+ opt.ttl = String.valueOf(notification.getExpireTTLSeconds());
+ }
switch (translatedNotification.getType()) {
case "toast":
WnsToast toast = new WnsToastBuilder().bindingTemplateToastText01(translatedNotification.getMessage().toString()).build();
[2/2] usergrid git commit: Merge branch '2.1-release' of
https://git-wip-us.apache.org/repos/asf/usergrid into 2.1-release
Posted by sf...@apache.org.
Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid into 2.1-release
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/204bf042
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/204bf042
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/204bf042
Branch: refs/heads/2.1-release
Commit: 204bf04272be75056a05e40b4bf6d3c389f0b134
Parents: 24600e0 7945209
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Nov 11 09:49:04 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Nov 11 09:49:04 2015 -0700
----------------------------------------------------------------------
.../read/traverse/AbstractReadGraphFilter.java | 6 +-
.../usergrid/corepersistence/index/RxTest.java | 5 +-
.../persistence/graph/guice/GraphModule.java | 7 -
.../impl/shard/DirectedEdgeMeta.java | 4 +-
.../impl/shard/EdgeShardStrategy.java | 10 +-
.../impl/shard/NodeShardApproximation.java | 66 --
.../impl/shard/ShardEntryGroup.java | 3 +-
.../impl/shard/ShardedEdgeSerialization.java | 2 +-
.../serialization/impl/shard/count/Counter.java | 131 ----
.../shard/count/NodeShardApproximationImpl.java | 272 --------
.../count/NodeShardCounterSerialization.java | 48 --
.../NodeShardCounterSerializationImpl.java | 186 ------
.../impl/shard/count/ShardKey.java | 75 ---
.../shard/impl/NodeShardAllocationImpl.java | 19 +-
.../impl/shard/impl/ShardGroupDeletionImpl.java | 158 ++---
.../impl/ShardedEdgeSerializationImpl.java | 28 -
.../shard/impl/SizebasedEdgeColumnFamilies.java | 4 +-
.../shard/impl/SizebasedEdgeShardStrategy.java | 13 +-
.../graph/GraphManagerShardConsistencyIT.java | 5 +
.../graph/GraphManagerShardingIT.java | 208 ------
.../impl/shard/NodeShardAllocationTest.java | 48 +-
.../impl/shard/ShardEntryGroupTest.java | 28 +
.../shard/count/NodeShardApproximationTest.java | 627 -------------------
.../NodeShardCounterSerializationTest.java | 124 ----
.../shard/impl/ShardGroupDeletionImplTest.java | 5 +
.../persistence/queue/DefaultQueueManager.java | 58 +-
.../java-wns/1.2-USERGRID/_remote.repositories | 7 +
...a-wns-1.2-USERGRID-jar-with-dependencies.jar | Bin 0 -> 1836665 bytes
.../java-wns-1.2-USERGRID-javadoc.jar | Bin 0 -> 234289 bytes
.../java-wns-1.2-USERGRID-sources.jar | Bin 0 -> 21654 bytes
.../1.2-USERGRID/java-wns-1.2-USERGRID.jar | Bin 0 -> 33164 bytes
.../1.2-USERGRID/java-wns-1.2-USERGRID.pom | 128 ++++
stack/pom.xml | 14 +-
stack/rest/pom.xml | 10 +
.../exceptions/AbstractExceptionMapper.java | 8 +-
stack/services/pom.xml | 10 +-
.../services/AbstractCollectionService.java | 10 +-
.../notifications/wns/WNSAdapterTest.java | 49 ++
38 files changed, 399 insertions(+), 1977 deletions(-)
----------------------------------------------------------------------