svn commit: r1461265 - in /accumulo/branches/1.5: core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java

[vi...@apache.org]

Author: vines
Date: Tue Mar 26 18:45:04 2013
New Revision: 1461265

URL: http://svn.apache.org/r1461265
Log:
ACCUMULO-1161 - fixed logic error for backwards compatability. Also, more descriptive error messaging.


Modified:
    accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
    accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java

Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java?rev=1461265&r1=1461264&r2=1461265&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java Tue Mar 26 18:45:04 2013
@@ -54,6 +54,8 @@ public class AccumuloSecurityException e
         return "The configured permission handler failed for some reason";
       case TOKEN_EXPIRED:
         return "The supplied token expired, please update and try again";
+      case INSUFFICIENT_PROPERTIES:
+        return "The login properties supplied are not sufficient for authentication. Please check the requested properties and try again";
       case DEFAULT_SECURITY_ERROR:
       default:
         return "Unknown security exception";

Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java?rev=1461265&r1=1461264&r2=1461265&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java (original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java Tue Mar 26 18:45:04 2013
@@ -73,7 +73,7 @@ abstract class Basic extends BasicServle
       principal = conf.get(Property.TRACE_USER);
     AuthenticationToken at;
     Map<String, String> loginMap = conf.getAllPropertiesWithPrefix(Property.TRACE_LOGIN_PROPERTIES);
-    if (loginMap == null)
+    if (loginMap.isEmpty())
       at = new PasswordToken(conf.get(Property.TRACE_PASSWORD).getBytes());
     else{
       Properties props = new Properties();