You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2015/12/21 17:54:40 UTC
[3/3] usergrid git commit: Doh! Fetched wrong org.
Doh! Fetched wrong org.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/7a2e68f3
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/7a2e68f3
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/7a2e68f3
Branch: refs/heads/1.x
Commit: 7a2e68f3bccc9176e414896b4b26f0f45ac4bb6d
Parents: 97a12f2
Author: Dave Johnson <sn...@apache.org>
Authored: Mon Dec 21 11:51:10 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Mon Dec 21 11:51:10 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/usergrid/tools/DuplicateOrgRepair.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/7a2e68f3/stack/tools/src/main/java/org/apache/usergrid/tools/DuplicateOrgRepair.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/DuplicateOrgRepair.java b/stack/tools/src/main/java/org/apache/usergrid/tools/DuplicateOrgRepair.java
index f3a408a..806f873 100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/DuplicateOrgRepair.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/DuplicateOrgRepair.java
@@ -536,7 +536,7 @@ public class DuplicateOrgRepair extends ToolBase {
managementService.updateOrganization( orgInfo );
// fix the org name index
- OrganizationInfo orgInfoKeeper = managementService.getOrganizationByUuid( duplicate.getId() );
+ OrganizationInfo orgInfoKeeper = managementService.getOrganizationByUuid( keeper.getId() );
try {
managementService.updateOrganizationUniqueIndex( orgInfoKeeper, duplicate.getId() );