Author: vines
Date: Thu Mar 7 23:32:50 2013
New Revision: 1454168
URL: http://svn.apache.org/r1454168
Log:
ACCUMULO-1162 - WalkingSecurity was being cached, so state initialization in it
never happened
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1454163-1454165
Modified:
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java?rev=1454168&r1=1454167&r2=1454168&view=diff
==============================================================================
---
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java
(original)
+++
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java
Thu Mar 7 23:32:50 2013
@@ -95,6 +95,7 @@ public class SecurityFixture extends Fix
String systemUserName = WalkingSecurity.get(state).getSysUserName();
log.debug("Dropping user: " + systemUserName);
conn.securityOperations().dropLocalUser(systemUserName);
+ WalkingSecurity.clearInstance();
}
}
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=1454168&r1=1454167&r2=1454168&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
Thu Mar 7 23:32:50 2013
@@ -419,4 +419,8 @@ public class WalkingSecurity extends Sec
toRet.add(internal);
return toRet;
}
+
+ public static void clearInstance() {
+ instance = null;
+ }
}