Skip to content

Fixes for Windows failures after FileLike refactor #952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 1 commit into from
Nov 9, 2025
Merged

Fixes for Windows failures after FileLike refactor #952

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import org.labkey.api.view.HttpView;
import org.labkey.api.view.JspView;
import org.labkey.api.view.NavTree;
import org.labkey.api.view.NotFoundException;
import org.labkey.api.view.RedirectException;
import org.labkey.api.view.ViewBackgroundInfo;
import org.labkey.api.view.template.PageConfig;
Expand Down Expand Up @@ -95,6 +96,7 @@
import java.io.IOException;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -370,8 +372,15 @@ protected ModelAndView confirmRuns(ImportRunsForm form, BindException errors)
{
validatePipeline();

collectNewPaths(form, errors);
return new JspView<PipelinePathForm>("/org/labkey/flow/controllers/executescript/confirmRunsToImport.jsp", form, errors);
try
{
collectNewPaths(form, errors);
return new JspView<PipelinePathForm>("/org/labkey/flow/controllers/executescript/confirmRunsToImport.jsp", form, errors);
}
catch (InvalidPathException e)
{
throw new NotFoundException(e.getMessage());
}
}

protected ModelAndView uploadRuns(ImportRunsForm form, BindException errors) throws Exception
Expand Down Expand Up @@ -985,7 +994,7 @@ private void accelerateWizard(ImportAnalysisForm form, BindException errors, Run

// Set the data folder if we aren't using an existing run
if (SelectFCSFileOption.None == form.getSelectFCSFilesOption())
form.setKeywordDir(new String[]{getWorkspaceFolder(form).toString()});
form.setKeywordDir(new String[]{getPipeRoot().relativePath(getWorkspaceFolder(form))});

// Select FCS file (by default we already select all fcs files in working folder)
stepSelectFCSFiles(form, errors);
Expand Down