You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by jm...@apache.org on 2018/04/05 17:19:50 UTC
[accumulo] branch master updated (8a4d553 -> c7f2b1e)
This is an automated email from the ASF dual-hosted git repository.
jmark99 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from 8a4d553 Merge branch '1.8'
add 161c01e ACCUMULO-4791 correct setshelliter usage
add 9fdf43a ACCUMULO-4585 Fix bootstrap_config memory profiles
add 63697e7 Merge branch 'ACCUMULO-4791-1.9' into 1.8
new c7f2b1e 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:
.../accumulo/shell/commands/SetIterCommand.java | 100 +++++++++++++++------
.../shell/commands/SetShellIterCommand.java | 38 +++-----
.../org/apache/accumulo/test/ShellServerIT.java | 93 ++++++++++++++-----
3 files changed, 154 insertions(+), 77 deletions(-)
--
To stop receiving notification emails like this one, please contact
jmark99@apache.org.
[accumulo] 01/01: Merge branch '1.8'
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmark99 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit c7f2b1e304c98a503014cb6a29c693da8cf7d07a
Merge: 8a4d553 63697e7
Author: Mark Owens <jm...@gmail.com>
AuthorDate: Thu Apr 5 13:18:09 2018 -0400
Merge branch '1.8'
.../accumulo/shell/commands/SetIterCommand.java | 100 +++++++++++++++------
.../shell/commands/SetShellIterCommand.java | 38 +++-----
.../org/apache/accumulo/test/ShellServerIT.java | 93 ++++++++++++++-----
3 files changed, 154 insertions(+), 77 deletions(-)
diff --cc shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
index a3bdf72,c692215..5242f0e
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
@@@ -210,13 -237,13 +237,11 @@@ public class SetIterCommand extends Com
msg.append("; class not found.");
}
throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, msg.toString());
- } catch (InstantiationException e) {
- throw new IllegalArgumentException(e.getMessage());
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException | IllegalAccessException e) {
throw new IllegalArgumentException(e.getMessage());
} catch (ClassCastException e) {
- StringBuilder msg = new StringBuilder(50);
- msg.append(className).append(" loaded successfully but does not implement SortedKeyValueIterator.");
- msg.append(" This class cannot be used with this command.");
- throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, msg.toString());
+ String msg = className + " loaded successfully but does not implement SortedKeyValueIterator." + " This class cannot be used with this command.";
+ throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, msg);
}
@SuppressWarnings("unchecked")
--
To stop receiving notification emails like this one, please contact
jmark99@apache.org.