Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c5f80656 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c5f80656 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c5f80656 Branch: refs/heads/master Commit: c5f80656a40fd07e3ac4f25f68e1502b2d1951ba Parents: 6699800 59716f0 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Feb 26 15:58:51 2014 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Feb 26 15:58:51 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/tserver/log/DfsLogger.java | 137 +++++++++---------- 1 file changed, 65 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c5f80656/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java ---------------------------------------------------------------------- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java index e52f739,55df118..1504c94 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java @@@ -320,10 -318,10 +319,10 @@@ public class DfsLogger } return new DFSLoggerInputStreams(input, decryptingInput); } - + public synchronized void open(String address) throws IOException { String filename = UUID.randomUUID().toString(); - String logger = StringUtil.join(Arrays.asList(address.split(":")), "+"); + String logger = Joiner.on("+").join(address.split(":")); log.debug("DfsLogger.open() begin"); VolumeManager fs = conf.getFileSystem(); @@@ -540,7 -532,7 +533,7 @@@ public String getLogger() { String parts[] = logPath.split("/"); - return StringUtil.join(Arrays.asList(parts[parts.length - 2].split("[+]")), ":"); + return Joiner.on(":").join(parts[parts.length - 2].split("[+]")); } - + }
