Repository: gora Updated Branches: refs/heads/master a3f44256d -> 1f6ba329e
GORA-420: AccumuloStore.createSchema fails when table already exists Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/1f6ba329 Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/1f6ba329 Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/1f6ba329 Branch: refs/heads/master Commit: 1f6ba329ecaa8d3c06c8b4bd159cca933e59c23a Parents: a3f4425 Author: Lewis John McGibbney <[email protected]> Authored: Wed Aug 26 17:00:56 2015 -0700 Committer: Lewis John McGibbney <[email protected]> Committed: Wed Aug 26 17:00:56 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 5 +++-- .../main/java/org/apache/gora/accumulo/store/AccumuloStore.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/1f6ba329/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index a149f82..d87d74e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,8 +2,9 @@ ==CHANGES.txt ======================================================================= -Apache Gora 0.6.1 Release - 02/03/2015 (dd/mm/yyyy) -Release Report - http://s.apache.org/l69 +Current Development + +* GORA-420: AccumuloStore.createSchema fails when table already exists (gerhardgossen via lewismc) * GORA-427 Configure MongoDB ReadPreference and WriteConcern (drazzib) http://git-wip-us.apache.org/repos/asf/gora/blob/1f6ba329/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java ---------------------------------------------------------------------- diff --git a/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java b/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java index 58e84ac..38566f8 100644 --- a/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java +++ b/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java @@ -368,7 +368,7 @@ public class AccumuloStore<K,T extends PersistentBase> extends DataStoreBase<K,T } credentials = CredentialHelper.create(user, token, conn.getInstance().getInstanceID()); - if (autoCreateSchema) + if (autoCreateSchema && !schemaExists()) createSchema(); } catch (AccumuloException e) { throw new IOException(e);
