You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2013/02/26 22:07:12 UTC
svn commit: r1450424 - in /accumulo/trunk: ./
test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
Author: vines
Date: Tue Feb 26 21:07:12 2013
New Revision: 1450424
URL: http://svn.apache.org/r1450424
Log:
ACCUMULO-1114 a partial fix for user/table password handling
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1450297-1450392,1450394-1450396,1450398-1450399,1450401-1450417
Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java?rev=1450424&r1=1450423&r2=1450424&view=diff
==============================================================================
--- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java (original)
+++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java Tue Feb 26 21:07:12 2013
@@ -280,7 +280,7 @@ public class WalkingSecurity extends Sec
}
public byte[] getUserPassword(String user) {
- Object obj = state.get(getSysUserName() + userPass);
+ Object obj = state.get(user + userPass);
if (obj instanceof PasswordToken) {
return ((PasswordToken) obj).getPassword();
}
@@ -296,7 +296,11 @@ public class WalkingSecurity extends Sec
}
public byte[] getTabPassword() {
- return (byte[]) state.get(getTabUserName() + userPass);
+ Object obj = state.get(getTabUserName() + userPass);
+ if (obj instanceof PasswordToken) {
+ return ((PasswordToken) obj).getPassword();
+ }
+ return null;
}
public boolean userPassTransient(String user) {