You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mm...@apache.org on 2018/03/06 19:43:35 UTC
[accumulo] branch master updated (e958733 -> cdd8c9e)
This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from e958733 Merge branch '1.8'
add 68f70d5 ACCUMULO-4835 Make TableOps throw TableNotFound (#395)
add d2908b5 Merge branch '1.7' into 1.8
new cdd8c9e Merge branch '1.8'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/accumulo/core/client/impl/TableOperationsImpl.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--
To stop receiving notification emails like this one, please contact
mmiller@apache.org.
[accumulo] 01/01: Merge branch '1.8'
Posted by mm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit cdd8c9ee35c47963fa91bb702c6a4465237146c5
Merge: e958733 d2908b5
Author: Mike Miller <mm...@apache.org>
AuthorDate: Tue Mar 6 14:42:54 2018 -0500
Merge branch '1.8'
.../org/apache/accumulo/core/client/impl/TableOperationsImpl.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index 2518f8c,be4999f..0f1b598
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@@ -1137,9 -1108,12 +1137,12 @@@ public class TableOperationsImpl extend
if (Tables.getTableState(context.getInstance(), tableId) != expectedState) {
Tables.clearCache(context.getInstance());
- if (Tables.getTableState(context.getInstance(), tableId) != expectedState) {
+ TableState currentState = Tables.getTableState(context.getInstance(), tableId);
+ if (currentState != expectedState) {
if (!Tables.exists(context.getInstance(), tableId))
- throw new TableDeletedException(tableId);
+ throw new TableDeletedException(tableId.canonicalID());
+ if (currentState == TableState.DELETING)
- throw new TableNotFoundException(tableId, "", "Table is being deleted.");
++ throw new TableNotFoundException(tableId.canonicalID(), "", "Table is being deleted.");
throw new AccumuloException("Unexpected table state " + tableId + " " + Tables.getTableState(context.getInstance(), tableId) + " != " + expectedState);
}
}
--
To stop receiving notification emails like this one, please contact
mmiller@apache.org.