accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmil...@apache.org
Subject [accumulo] 01/01: Merge branch '1.8'
Date Tue, 06 Mar 2018 19:43:36 GMT
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 <mmiller@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.

Mime
View raw message