From 9ca7b813255f813e8f607e84c8acd3a8b3aa898d Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 21 Sep 2016 08:17:08 +0000
Subject: [PATCH] SSDM-4138: Bug fixed when ftp.server.ftp-port isn't
specified.
SVN: 37091
---
.../dss/generic/server/ftp/FtpServer.java | 6 +++--
.../generic/server/ftp/FtpServerConfig.java | 22 ++++++++++---------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServer.java
index 2a46bac0650..33f12b9ee8c 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServer.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServer.java
@@ -75,6 +75,7 @@ import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.properties.ExtendedProperties;
import ch.systemsx.cisd.common.properties.PropertyParametersUtil;
import ch.systemsx.cisd.common.utilities.SystemTimeProvider;
import ch.systemsx.cisd.openbis.dss.generic.shared.utils.DssPropertyParametersUtil;
@@ -116,9 +117,10 @@ public class FtpServer implements FileSystemFactory, org.apache.sshd.server.File
this.generalInfoService = generalInfoService;
this.v3api = v3api;
this.userManager = userManager;
+ ExtendedProperties serviceProperties = DssPropertyParametersUtil.loadServiceProperties();
Properties ftpProperties = PropertyParametersUtil.extractSingleSectionProperties(
- DssPropertyParametersUtil.loadServiceProperties(), "ftp.server", true).getProperties();
- this.config = new FtpServerConfig(ftpProperties);
+ serviceProperties, "ftp.server", true).getProperties();
+ this.config = new FtpServerConfig(serviceProperties);
FtpPathResolverConfig resolverConfig = new FtpPathResolverConfig(ftpProperties);
this.pathResolverRegistry = resolverConfig.getResolverRegistry();
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServerConfig.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServerConfig.java
index ca1d9c734ae..c3c5c890617 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServerConfig.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServerConfig.java
@@ -34,25 +34,27 @@ public class FtpServerConfig
private static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
FtpServerConfig.class);
- final static String ENABLE_KEY = "enable";
+ private final static String PREFIX = "ftp.server.";
- final static String SFTP_PORT_KEY = "sftp-port";
+ final static String ENABLE_KEY = PREFIX + "enable";
- final static String LEGACY_FTP_PORT_KEY = "port";
+ final static String SFTP_PORT_KEY = PREFIX + "sftp-port";
- final static String FTP_PORT_KEY = "ftp-port";
+ final static String LEGACY_FTP_PORT_KEY = PREFIX + "port";
- final static String USE_SSL_KEY = "use-ssl";
+ final static String FTP_PORT_KEY = PREFIX + "ftp-port";
- final static String IMPLICIT_SSL_KEY = "implicit-ssl";
+ final static String USE_SSL_KEY = PREFIX + "use-ssl";
- final static String MAX_THREADS_KEY = "maxThreads";
+ final static String IMPLICIT_SSL_KEY = PREFIX + "implicit-ssl";
- final static String ACTIVE_MODE_ENABLE_KEY = "activemode.enable";
+ final static String MAX_THREADS_KEY = PREFIX + "maxThreads";
- final static String ACTIVE_PORT_KEY = "activemode.port";
+ final static String ACTIVE_MODE_ENABLE_KEY = PREFIX + "activemode.enable";
- final static String PASSIVE_MODE_PORT_RANGE_KEY = "passivemode.port.range";
+ final static String ACTIVE_PORT_KEY = PREFIX + "activemode.port";
+
+ final static String PASSIVE_MODE_PORT_RANGE_KEY = PREFIX + "passivemode.port.range";
private static final int DEFAULT_ACTIVE_PORT = 2122;
--
GitLab