fix serviceinvocation it
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c7a4b19e Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c7a4b19e Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c7a4b19e Branch: refs/heads/USERGRID-641 Commit: c7a4b19e2ae8e3d6fc454a9d07a46eb975981482 Parents: 0c16f0e Author: Shawn Feldman <[email protected]> Authored: Fri May 15 13:09:54 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Fri May 15 13:09:54 2015 -0600 ---------------------------------------------------------------------- .../org/apache/usergrid/corepersistence/CpRelationManager.java | 5 ++++- .../org/apache/usergrid/corepersistence/util/CpNamingUtils.java | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c7a4b19e/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java index 797788e..6690346 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java @@ -913,7 +913,10 @@ public class CpRelationManager implements RelationManager { if ( query.isGraphSearch() ) { // if(query.getResultsLevel() == Level.ALL_PROPERTIES) - readPipelineBuilder.getConnection( connection ); + if(entityType ==null ) + readPipelineBuilder.getConnection( connection ); + else + readPipelineBuilder.getConnection(connection, entityType); //else } else { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c7a4b19e/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java index b8d410d..f4a4888 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/util/CpNamingUtils.java @@ -21,6 +21,7 @@ package org.apache.usergrid.corepersistence.util; import java.util.UUID; +import com.google.common.base.Optional; import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl; import org.apache.usergrid.persistence.entities.Application; @@ -196,7 +197,7 @@ public class CpNamingUtils { final String edgeType = getEdgeTypeFromConnectionType( connectionType ); return new SimpleSearchByEdge( sourceId, edgeType, targetId, Long.MAX_VALUE, SearchByEdgeType.Order.DESCENDING, - null ); + Optional.absent() ); }
