Skip to content

Commit eec2c8e

Browse files
committed
Convert File usages to use FileLike or the comparable class
1 parent 86b2cab commit eec2c8e

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

flow/src/org/labkey/flow/controllers/FlowController.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.labkey.api.security.permissions.ReadPermission;
4242
import org.labkey.api.settings.AdminConsole;
4343
import org.labkey.api.settings.AdminConsole.SettingsLinkType;
44+
import org.labkey.api.util.FileUtil;
4445
import org.labkey.api.util.JobRunner;
4546
import org.labkey.api.util.TestContext;
4647
import org.labkey.api.view.ActionURL;
@@ -64,11 +65,12 @@
6465
import org.labkey.flow.query.FlowSchema;
6566
import org.labkey.flow.webparts.FlowFolderType;
6667
import org.labkey.flow.webparts.OverviewWebPart;
68+
import org.labkey.vfs.FileLike;
69+
import org.labkey.vfs.FileSystemLike;
6770
import org.springframework.validation.BindException;
6871
import org.springframework.validation.Errors;
6972
import org.springframework.web.servlet.ModelAndView;
7073

71-
import java.io.File;
7274
import java.net.URI;
7375

7476
@Marshal(Marshaller.Jackson)
@@ -312,7 +314,9 @@ public boolean handlePost(FlowAdminForm form, BindException errors)
312314
{
313315
if (form.getWorkingDirectory() != null)
314316
{
315-
File dir = new File(form.getWorkingDirectory());
317+
FileLike dir = new FileSystemLike.Builder(FileUtil.stringToPath(getContainer(), form.getWorkingDirectory()))
318+
.readonly().root();
319+
316320
if (!dir.exists())
317321
{
318322
errors.rejectValue("workingDirectory", ERROR_MSG, "Path does not exist: " + form.getWorkingDirectory());

0 commit comments

Comments
 (0)