usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mru...@apache.org
Subject [5/7] usergrid git commit: NPE bug fix and uncommenting the test
Date Fri, 12 Aug 2016 20:53:40 GMT
NPE bug fix and uncommenting the test


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/588a0b58
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/588a0b58
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/588a0b58

Branch: refs/heads/master
Commit: 588a0b5848eb946492afbfb7fa50cd3a4ca79c78
Parents: 7383469
Author: Ayesha Dastagiri <ayesha.amrin@gmail.com>
Authored: Fri Aug 12 13:03:25 2016 -0700
Committer: Ayesha Dastagiri <ayesha.amrin@gmail.com>
Committed: Fri Aug 12 13:03:25 2016 -0700

----------------------------------------------------------------------
 .../java/org/apache/usergrid/persistence/EntityConnectionsIT.java  | 2 --
 .../org/apache/usergrid/services/AbstractConnectionsService.java   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/588a0b58/stack/core/src/test/java/org/apache/usergrid/persistence/EntityConnectionsIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/EntityConnectionsIT.java
b/stack/core/src/test/java/org/apache/usergrid/persistence/EntityConnectionsIT.java
index 3d4e53c..d9ee960 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/EntityConnectionsIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/EntityConnectionsIT.java
@@ -20,7 +20,6 @@ package org.apache.usergrid.persistence;
 import org.apache.usergrid.AbstractCoreIT;
 import org.apache.usergrid.persistence.Query.Level;
 import org.apache.usergrid.persistence.entities.User;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -329,7 +328,6 @@ public class EntityConnectionsIT extends AbstractCoreIT {
     }
 
     //not required . addd tests at service layer.
-    @Ignore
     @Test
     public void testGetConnectingEntitiesCursor() throws Exception {
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/588a0b58/stack/services/src/main/java/org/apache/usergrid/services/AbstractConnectionsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/AbstractConnectionsService.java
b/stack/services/src/main/java/org/apache/usergrid/services/AbstractConnectionsService.java
index 0a9f6a7..dee78f9 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/AbstractConnectionsService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/AbstractConnectionsService.java
@@ -233,7 +233,7 @@ public class AbstractConnectionsService extends AbstractService {
 
         ServiceResults results = getItemsByQuery( context, context.getQuery() );
 
-        if ( results.size() == 0 ) {
+        if ( results == null || results.size() == 0 ) {
             throw new ServiceResourceNotFoundException( context );
         }
 


Mime
View raw message