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:39 UTC
[2/3] usergrid git commit: Use correct UUID for keeper.
Use correct UUID for keeper.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/97a12f21
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/97a12f21
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/97a12f21
Branch: refs/heads/1.x
Commit: 97a12f2101d3a9c544d0d27e198ef59bd848220f
Parents: 9be5d3a
Author: Dave Johnson <sn...@apache.org>
Authored: Mon Dec 21 11:46:02 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Mon Dec 21 11:46:02 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/97a12f21/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 b1f2afc..f3a408a 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
@@ -538,7 +538,7 @@ public class DuplicateOrgRepair extends ToolBase {
// fix the org name index
OrganizationInfo orgInfoKeeper = managementService.getOrganizationByUuid( duplicate.getId() );
try {
- managementService.updateOrganizationUniqueIndex( orgInfo, duplicate.getId() );
+ managementService.updateOrganizationUniqueIndex( orgInfoKeeper, duplicate.getId() );
} catch ( Exception e ) {
// if there are multiple duplicates this will fail for all but one of them. That's OK