Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0DB33172A1 for ; Mon, 20 Oct 2014 13:46:32 +0000 (UTC) Received: (qmail 10153 invoked by uid 500); 20 Oct 2014 13:46:29 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 10083 invoked by uid 500); 20 Oct 2014 13:46:29 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 9902 invoked by uid 99); 20 Oct 2014 13:46:29 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Oct 2014 13:46:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 43C559B15D2; Mon, 20 Oct 2014 13:46:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: snoopdave@apache.org To: commits@usergrid.apache.org Date: Mon, 20 Oct 2014 13:46:38 -0000 Message-Id: In-Reply-To: <3886f80d5df9455c8ecb83dfd658e8af@git.apache.org> References: <3886f80d5df9455c8ecb83dfd658e8af@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/50] [abbrv] git commit: Fixes bug with lifecycle manager cache lazy loading Fixes bug with lifecycle manager cache lazy loading Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9da529b9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9da529b9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9da529b9 Branch: refs/heads/two-dot-o-events Commit: 9da529b98dfa7c7996bdcfe2623732cb823d3907 Parents: ce2db8a Author: Todd Nine Authored: Thu Oct 16 09:50:15 2014 -0600 Committer: Todd Nine Committed: Thu Oct 16 09:50:15 2014 -0600 ---------------------------------------------------------------------- .../usergrid/corepersistence/CpEntityManagerFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9da529b9/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java index 4d296ba..2abe83f 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java @@ -641,15 +641,15 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application private List getManagementIndexes() { return Arrays.asList( - managerCache.getEntityIndex( new ApplicationScopeImpl( + getManagerCache().getEntityIndex( new ApplicationScopeImpl( new SimpleId( SYSTEM_APP_ID, "application" ) ) ), // default app - managerCache.getEntityIndex( new ApplicationScopeImpl( + getManagerCache().getEntityIndex( new ApplicationScopeImpl( new SimpleId( getManagementAppId(), "application" ) ) ), // management app - managerCache.getEntityIndex( new ApplicationScopeImpl( + getManagerCache().getEntityIndex( new ApplicationScopeImpl( new SimpleId( getDefaultAppId(), "application" ) ) ) ); }