From d2fbc56f5f8c7006e453c73bc87e2f56b1dae06e Mon Sep 17 00:00:00 2001 From: Paul Millar Date: Mon, 7 Apr 2014 19:05:55 +0200 Subject: [PATCH] ftp: fix broken back-port The back-port of CKSM fix assumes a later version of the Guava library. This patch provides similar functionality as the splitToList method. Patch developed in consultation with Gerd, although without a formal Ship It. --- .../main/java/diskCacheV111/doors/AbstractFtpDoorV1.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/dcache-ftp/src/main/java/diskCacheV111/doors/AbstractFtpDoorV1.java b/modules/dcache-ftp/src/main/java/diskCacheV111/doors/AbstractFtpDoorV1.java index 6ee3e123296..3ceff8fce75 100755 --- a/modules/dcache-ftp/src/main/java/diskCacheV111/doors/AbstractFtpDoorV1.java +++ b/modules/dcache-ftp/src/main/java/diskCacheV111/doors/AbstractFtpDoorV1.java @@ -69,6 +69,8 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING package diskCacheV111.doors; import com.google.common.base.Strings; +import com.google.common.base.Splitter; +import com.google.common.collect.Lists; import com.google.common.collect.Ranges; import javax.security.auth.Subject; @@ -92,12 +94,14 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING import java.security.NoSuchAlgorithmException; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; +import java.util.List; import java.util.Map; import java.util.Queue; import java.util.Set; @@ -2235,7 +2239,7 @@ public void ac_cksm(String arg) { checkLoggedIn(); - List st = Splitter.on(' ').limit(4).splitToList(arg); + List st = Lists.newArrayList(Splitter.on(' ').limit(4).split(arg)); if (st.size() != 4) { reply("500 Unsupported CKSM command operands"); return;