You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/11/15 03:56:44 UTC
[4/5] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/28bbb56f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/28bbb56f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/28bbb56f
Branch: refs/heads/master
Commit: 28bbb56f32a49a2d2dd0a7730ec90b7455a0c9d0
Parents: 484053a ac20fe0
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Nov 14 21:52:39 2013 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Nov 14 21:52:39 2013 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/core/client/AccumuloSecurityException.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/28bbb56f/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
index f626f4d,ea73640..06b148d
--- a/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
@@@ -26,9 -25,9 +26,9 @@@ import org.apache.commons.lang.StringUt
*/
public class AccumuloSecurityException extends Exception {
private static final long serialVersionUID = 1L;
-
+
private static String getDefaultErrorMessage(final SecurityErrorCode errorcode) {
- switch (errorcode) {
+ switch (errorcode == null ? SecurityErrorCode.DEFAULT_SECURITY_ERROR : errorcode) {
case BAD_CREDENTIALS:
return "Username or Password is Invalid";
case CONNECTION_ERROR: