SSDM-4843: RsyncCopierFactory: handle null argument....

SSDM-4843: RsyncCopierFactory: handle null argument. RsyncArchiveCopierFactory: fixing bug in case of non-null argument.

SVN: 37922

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiveCopierFactory.java

@@ -18,6 +18,7 @@ package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -43,7 +44,8 @@ public final class RsyncArchiveCopierFactory implements Serializable, IPathCopie
     @Override
     public IPathCopier create(File rsyncExecutable, File sshExecutableOrNull, long timeoutInMillis, List<String> additionalCmdLineFlagsOrNull)
     {
-        List<String> additionalCmdLineFlags = Arrays.asList("--archive", "--delete", "--inplace", "--checksum", getTimeoutParameter(timeoutInMillis));
+        List<String> additionalCmdLineFlags = new ArrayList<>(
+                Arrays.asList("--archive", "--delete", "--inplace", "--checksum", getTimeoutParameter(timeoutInMillis)));
         if (additionalCmdLineFlagsOrNull != null)
         {
             additionalCmdLineFlags.addAll(additionalCmdLineFlagsOrNull);

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncCopierFactory.java

@@ -28,8 +28,15 @@ public final class RsyncCopierFactory implements Serializable, IPathCopierFactor
     private static final long serialVersionUID = 1L;
 
     @Override
-    public IPathCopier create(File rsyncExecutable, File sshExecutableOrNull, long timeoutInMillis, List<String> additionalCmdLineFlagsOrNull)
+    public IPathCopier create(File rsyncExecutable, File sshExecutableOrNull, long timeoutInMillis, 
+            List<String> additionalCmdLineFlagsOrNull)
     {
-        return new RsyncCopier(rsyncExecutable, sshExecutableOrNull, false, false, additionalCmdLineFlagsOrNull.toArray(new String[0]));
+        String[] additionalCmdLineFlags = new String[0];
+        if (additionalCmdLineFlagsOrNull != null)
+        {
+            additionalCmdLineFlags = additionalCmdLineFlagsOrNull.toArray(new String[0]);
+        }
+        return new RsyncCopier(rsyncExecutable, sshExecutableOrNull, false, false, 
+                additionalCmdLineFlags);
     }
 }
\ No newline at end of file