ACCUMULO-2427 close the open socket, allow for info after imok, report the last exception
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d7e939fd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d7e939fd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d7e939fd Branch: refs/heads/master Commit: d7e939fd9909779ade821ae7c7d1589c59fd978b Parents: 07604ca 9ff2c45 Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Mar 4 12:46:02 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Mar 4 12:46:02 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/core/client/impl/Tables.java | 18 +++++++++++------- .../minicluster/impl/MiniAccumuloClusterImpl.java | 4 ++-- 2 files changed, 13 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d7e939fd/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java ---------------------------------------------------------------------- diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java index 10ef48f,5988bda..1dd9ef0 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java @@@ -287,18 -287,21 +287,22 @@@ public class Tables /** * Returns the namespace id for a given table ID. - * @param instance The Accumulo Instance - * @param tableId The tableId + * + * @param instance + * The Accumulo Instance + * @param tableId + * The tableId * @return The namespace id which this table resides in. - * @throws IllegalArgumentException if the table doesn't exist in ZooKeeper + * @throws IllegalArgumentException + * if the table doesn't exist in ZooKeeper */ public static String getNamespaceId(Instance instance, String tableId) throws IllegalArgumentException { - ArgumentChecker.notNull(instance, tableId); + checkArgument(instance != null, "instance is null"); + checkArgument(tableId != null, "tableId is null"); - + ZooCache zc = getZooCache(instance); byte[] n = zc.get(ZooUtil.getRoot(instance) + Constants.ZTABLES + "/" + tableId + Constants.ZTABLE_NAMESPACE); - + // We might get null out of ZooCache if this tableID doesn't exist if (null == n) { throw new IllegalArgumentException("Table with id " + tableId + " does not exist"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d7e939fd/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ----------------------------------------------------------------------
