accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmar...@apache.org
Subject [accumulo] 01/01: Merge branch '1.8'
Date Thu, 05 Apr 2018 17:19:51 GMT
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 <jmarkowe@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.

Mime
View raw message