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/01 22:46:42 UTC
[2/2] git commit: check for bad path
check for bad path
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/74cca91c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/74cca91c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/74cca91c
Branch: refs/heads/two-dot-o
Commit: 74cca91ce345d116fe3c2eaaf6f0248d39a0ca78
Parents: c9f8ab7
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Oct 1 14:46:06 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Oct 1 14:46:06 2014 -0600
----------------------------------------------------------------------
.../usergrid/services/notifications/ApplicationQueueManager.java | 2 +-
.../org/apache/usergrid/services/notifications/TaskManager.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/74cca91c/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 cb65e00..a057f31 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
@@ -364,7 +364,7 @@ public class ApplicationQueueManager implements QueueManager {
} catch (Exception e) {
LOG.error("Failure while sending",e);
try {
- if(!messageCommitted) {
+ if(!messageCommitted && queuePath != null) {
qm.commitTransaction(queuePath, message.getTransaction(), null);
}
}catch (Exception queueException){
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/74cca91c/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 07aed57..08f067d 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
@@ -32,8 +32,7 @@ import java.util.concurrent.atomic.AtomicLong;
public class TaskManager {
- private static final Logger LOG = LoggerFactory
- .getLogger(TaskManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TaskManager.class);
private final QueueManager proxy;
private final String queuePath;