Skip to content

More targeted NPE prevention. null experiment is sometimes expected #15

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-tchad merged 1 commit into from
Apr 23, 2019
Merged

More targeted NPE prevention. null experiment is sometimes expected #15

Show file tree
Hide file tree
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
4 changes: 0 additions & 4 deletions flow/src/org/labkey/flow/controllers/run/RunController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,6 @@ public class ShowRunsAction extends SimpleViewAction<RunsForm>
public ModelAndView getView(RunsForm form, BindException errors)
{
experiment = form.getExperiment();
if (experiment == null)
{
throw new NotFoundException();
}
// script = form.getScript();

checkContainer(experiment);
Expand Down
12 changes: 6 additions & 6 deletions flow/src/org/labkey/flow/controllers/run/RunsForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@

package org.labkey.flow.controllers.run;

import org.labkey.flow.query.FlowQueryForm;
import org.labkey.flow.query.FlowSchema;
import org.labkey.flow.query.FlowTableType;
import org.labkey.flow.data.FlowExperiment;
import org.labkey.flow.data.FlowScript;
import org.labkey.api.query.QuerySettings;
import org.labkey.api.query.UserSchema;
import org.labkey.api.view.ActionURL;
import org.labkey.flow.data.FlowExperiment;
import org.labkey.flow.data.FlowScript;
import org.labkey.flow.query.FlowQueryForm;
import org.labkey.flow.query.FlowSchema;
import org.labkey.flow.query.FlowTableType;

/**
* User: kevink
Expand Down Expand Up @@ -88,7 +88,7 @@ public QuerySettings createQuerySettings(UserSchema schema)

// adding the filter doesn't work because of bug 6520
// 6520 : can't set filter/sort on QuerySettings progamatically
if (getScript() != null)
if (getScript() != null && getScript().getExpObject() != null)
{
ActionURL sortFilter = getScript().getRunsUrl(ret.getSortFilterURL());
ret.setSortFilterURL(sortFilter);
Expand Down