From 1990a9682c88816a7c3cd08f8b5b81e51e39af85 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 16 Jun 2016 12:22:22 +0000
Subject: [PATCH] SSDM-3027: change default host.name to UNKNOWN and throw a
PathNotFoundException in DataSetCifsView.
SVN: 36695
---
.../cisd/openbis/dss/generic/server/cifs/CifsServerConfig.java | 2 +-
.../cisd/openbis/dss/generic/server/cifs/DataSetCifsView.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/cifs/CifsServerConfig.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/cifs/CifsServerConfig.java
index 7225f874ff0..3743f9cfb15 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/cifs/CifsServerConfig.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/cifs/CifsServerConfig.java
@@ -72,7 +72,7 @@ class CifsServerConfig
private static final String SMB_PORT_KEY = "smb-port";
private static Map<String, String> CONFIG_PARAMS = new MapBuilder<String, String>()
- .entry("host.name", "ETHZ")
+ .entry("host.name", "UNKNOWN")
.entry("host.domain", "OPENBIS")
.entry("broadcast-mask", "255.255.255.255")
.entry("smb-dialects", "LanMan,NT")
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/cifs/DataSetCifsView.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/cifs/DataSetCifsView.java
index b0d8dc8ffa0..c76784fdd0b 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/cifs/DataSetCifsView.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/cifs/DataSetCifsView.java
@@ -32,6 +32,7 @@ import org.alfresco.jlan.server.filesys.FileName;
import org.alfresco.jlan.server.filesys.FileOpenParams;
import org.alfresco.jlan.server.filesys.FileStatus;
import org.alfresco.jlan.server.filesys.NetworkFile;
+import org.alfresco.jlan.server.filesys.PathNotFoundException;
import org.alfresco.jlan.server.filesys.SearchContext;
import org.alfresco.jlan.server.filesys.TreeConnection;
import org.apache.ftpserver.ftplet.FtpException;
@@ -121,7 +122,7 @@ public class DataSetCifsView implements DiskInterface
return fileInfo;
} catch (FtpException ex)
{
- throw new IOException(ex);
+ throw new PathNotFoundException(ex.getMessage());
}
}
--
GitLab