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/02 19:46:23 UTC
[5/6] git commit: Log and ignore suspected empty collections and
connections.
Log and ignore suspected empty collections and connections.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/cff6e1cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/cff6e1cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/cff6e1cb
Branch: refs/heads/map
Commit: cff6e1cbf632900a6d0610dff1fa8ae6145bffe8
Parents: 878d634
Author: Dave Johnson <dm...@apigee.com>
Authored: Thu Oct 2 12:41:34 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Thu Oct 2 12:41:34 2014 -0400
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 80 +++++++++-----------
1 file changed, 36 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cff6e1cb/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index f618a80..d7f3a3b 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@ -2847,17 +2847,15 @@ public class CpEntityManager implements EntityManager {
collMgr.load( edge.getSourceNode() ).toBlockingObservable().last();
if (collEntity == null) {
- if (logger.isDebugEnabled()) {
- logger.error("FAILED to load entity {}:{} "
- + "from scope\n app {}\n owner {}\n name {}",
- new Object[]{
- edge.getSourceNode().getType(),
- edge.getSourceNode().getUuid(),
- collScope.getApplication(),
- collScope.getOwner(),
- collScope.getName()
- });
- }
+ logger.warn("(Empty collection?) Failed to load collection entity "
+ + "{}:{} from scope\n app {}\n owner {}\n name {}",
+ new Object[]{
+ edge.getSourceNode().getType(),
+ edge.getSourceNode().getUuid(),
+ collScope.getApplication(),
+ collScope.getOwner(),
+ collScope.getName()
+ });
return;
}
@@ -2872,17 +2870,15 @@ public class CpEntityManager implements EntityManager {
memberMgr.load( edge.getTargetNode()).toBlockingObservable().last();
if (memberEntity == null) {
- if (logger.isDebugEnabled()) {
- logger.error("FAILED to load entity {}:{} "
- + "from scope\n app {}\n owner {}\n name {}",
- new Object[]{
- edge.getTargetNode().getType(),
- edge.getTargetNode().getUuid(),
- memberScope.getApplication(),
- memberScope.getOwner(),
- memberScope.getName()
- });
- }
+ logger.warn("(Empty collection?) Failed to load member entity "
+ + "{}:{} from scope\n app {}\n owner {}\n name {}",
+ new Object[]{
+ edge.getTargetNode().getType(),
+ edge.getTargetNode().getUuid(),
+ memberScope.getApplication(),
+ memberScope.getOwner(),
+ memberScope.getName()
+ });
return;
}
@@ -2917,17 +2913,15 @@ public class CpEntityManager implements EntityManager {
sourceEcm.load( edge.getSourceNode() ).toBlockingObservable().last();
if (sourceEntity == null) {
- if (logger.isDebugEnabled()) {
- logger.error("FAILED to load entity {}:{} "
- + "from scope\n app {}\n owner {}\n name {}",
- new Object[]{
- edge.getSourceNode().getType(),
- edge.getSourceNode().getUuid(),
- sourceScope.getApplication(),
- sourceScope.getOwner(),
- sourceScope.getName()
- });
- }
+ logger.warn("(Empty connection?) Failed to load source entity "
+ + "{}:{} from scope\n app {}\n owner {}\n name {}",
+ new Object[]{
+ edge.getSourceNode().getType(),
+ edge.getSourceNode().getUuid(),
+ sourceScope.getApplication(),
+ sourceScope.getOwner(),
+ sourceScope.getName()
+ });
return;
}
@@ -2942,17 +2936,15 @@ public class CpEntityManager implements EntityManager {
targetEcm.load( edge.getTargetNode() ).toBlockingObservable().last();
if (targetEntity == null) {
- if (logger.isDebugEnabled()) {
- logger.error("FAILED to load entity {}:{} "
- + "from scope\n app {}\n owner {}\n name {}",
- new Object[]{
- edge.getTargetNode().getType(),
- edge.getTargetNode().getUuid(),
- targetScope.getApplication(),
- targetScope.getOwner(),
- targetScope.getName()
- });
- }
+ logger.warn("(Empty connection?) Failed to load target entity "
+ + "{}:{} from scope\n app {}\n owner {}\n name {}",
+ new Object[]{
+ edge.getTargetNode().getType(),
+ edge.getTargetNode().getUuid(),
+ targetScope.getApplication(),
+ targetScope.getOwner(),
+ targetScope.getName()
+ });
return;
}