Skip to content

Fix flow NPE: No need to use the ExpData to look itself up #909

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
Jul 26, 2025
Merged

Fix flow NPE: No need to use the ExpData to look itself up #909

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
6 changes: 3 additions & 3 deletions flow/src/org/labkey/flow/persist/AttributeSetHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public static void doSave(AttributeSet attrs, User user, ExpData data, @Nullable
List<List<?>> paramsList = new ArrayList<>();
for (Map.Entry<String, String> entry : keywords.entrySet())
{
AttributeCache.Entry a = AttributeCache.KEYWORDS.byAttribute(c, entry.getKey());
AttributeCache.Entry<?, ?> a = AttributeCache.KEYWORDS.byAttribute(c, entry.getKey());
assert a != null : "parepareForSave should have created an entry";
int preferredId = a.getAliasedId() == null ? a.getRowId() : a.getAliasedId();
int originalId = a.getRowId();
Expand All @@ -174,7 +174,7 @@ public static void doSave(AttributeSet attrs, User user, ExpData data, @Nullable
List<List<?>> paramsList = new ArrayList<>();
for (Map.Entry<StatisticSpec, Double> entry : statistics.entrySet())
{
AttributeCache.Entry a = AttributeCache.STATS.byAttribute(c, entry.getKey());
AttributeCache.Entry<?, ?> a = AttributeCache.STATS.byAttribute(c, entry.getKey());
assert a != null : "parepareForSave should have created an entry";
int preferredId = a.getAliasedId() == null ? a.getRowId() : a.getAliasedId();
int originalId = a.getRowId();
Expand Down Expand Up @@ -213,7 +213,7 @@ public static void doSave(AttributeSet attrs, User user, ExpData data, @Nullable
List<List<?>> paramsList = new ArrayList<>();
for (Map.Entry<GraphSpec, byte[]> entry : graphs.entrySet())
{
AttributeCache.Entry a = AttributeCache.GRAPHS.byAttribute(c, entry.getKey());
AttributeCache.Entry<?, ?> a = AttributeCache.GRAPHS.byAttribute(c, entry.getKey());
assert a != null : "parepareForSave should have created an entry";
int preferredId = a.getAliasedId() == null ? a.getRowId() : a.getAliasedId();
int originalId = a.getRowId();
Expand Down
4 changes: 2 additions & 2 deletions flow/src/org/labkey/flow/persist/FlowManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,9 +1029,9 @@ public void flowObjectModified()
}


public AttrObject createAttrObject(ExpData data, ObjectType type, URI uri)
public AttrObject createAttrObject(@NotNull ExpData data, ObjectType type, URI uri)
{
if (FlowDataHandler.instance.getPriority(ExperimentService.get().getExpData(data.getRowId())) != Handler.Priority.HIGH)
if (FlowDataHandler.instance.getPriority(data) != Handler.Priority.HIGH)
{
// Need to make sure the right ExperimentDataHandler is associated with this data file, otherwise, you
// won't be able to delete it because of the foreign key constraint from the flow.object table.
Expand Down