Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1078d65d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1078d65d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1078d65d Branch: refs/heads/master Commit: 1078d65daa6ab78fc9e1936cdfd02ac91bd904dd Parents: 4d7e90a d9ee274 Author: Josh Elser <[email protected]> Authored: Thu Jun 19 21:33:27 2014 -0700 Committer: Josh Elser <[email protected]> Committed: Thu Jun 19 21:33:27 2014 -0700 ---------------------------------------------------------------------- conf/examples/1GB/native-standalone/accumulo-site.xml | 2 +- conf/examples/1GB/standalone/accumulo-site.xml | 2 +- conf/examples/2GB/native-standalone/accumulo-site.xml | 2 +- conf/examples/2GB/standalone/accumulo-site.xml | 2 +- conf/examples/3GB/native-standalone/accumulo-site.xml | 2 +- conf/examples/3GB/standalone/accumulo-site.xml | 2 +- conf/examples/512MB/native-standalone/accumulo-site.xml | 2 +- conf/examples/512MB/standalone/accumulo-site.xml | 2 +- conf/examples/crypto/accumulo-site.xml | 2 +- conf/examples/vfs-classloader/accumulo-site.xml | 2 +- .../java/org/apache/accumulo/server/util/LoginProperties.java | 4 ++-- .../src/main/java/org/apache/accumulo/tracer/TraceServer.java | 4 ++-- 12 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1078d65d/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java ---------------------------------------------------------------------- diff --cc server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java index 1aad533,7eb9504..edb28c5 --- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java +++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java @@@ -181,10 -180,10 +181,10 @@@ public class TraceServer implements Wat Map<String,String> loginMap = conf.getAllPropertiesWithPrefix(Property.TRACE_TOKEN_PROPERTY_PREFIX); if (loginMap.isEmpty()) { Property p = Property.TRACE_PASSWORD; - at = new PasswordToken(conf.get(p).getBytes(Constants.UTF8)); + at = new PasswordToken(conf.get(p).getBytes(StandardCharsets.UTF_8)); } else { Properties props = new Properties(); - AuthenticationToken token = AccumuloClassLoader.getClassLoader().loadClass(conf.get(Property.TRACE_TOKEN_TYPE)).asSubclass(AuthenticationToken.class) + AuthenticationToken token = AccumuloVFSClassLoader.getClassLoader().loadClass(conf.get(Property.TRACE_TOKEN_TYPE)).asSubclass(AuthenticationToken.class) .newInstance(); int prefixLength = Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey().length();
