accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1461266 - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java server/ server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java
Date Tue, 26 Mar 2013 18:45:49 GMT
Author: vines
Date: Tue Mar 26 18:45:49 2013
New Revision: 1461266

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


Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1460921-1461104,1461106-1461110,1461112-1461246,1461248-1461258,1461260,1461262-1461265

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1460921-1461104,1461106-1461110,1461112-1461246,1461248-1461258,1461260,1461262-1461265

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java?rev=1461266&r1=1461265&r2=1461266&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java
Tue Mar 26 18:45:49 2013
@@ -55,6 +55,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";

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1460921-1461104,1461106-1461110,1461112-1461246,1461248-1461258,1461260,1461262-1461265

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java?rev=1461266&r1=1461265&r2=1461266&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java
(original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java
Tue Mar 26 18:45:49 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();



Mime
View raw message