Skip to content

Eliminate class-loading deadlock warning in ContainerFilter #535

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-adam merged 1 commit into from
Apr 1, 2025
Merged

Eliminate class-loading deadlock warning in ContainerFilter #535

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
2 changes: 1 addition & 1 deletion panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ protected void applyContainerFilter(ContainerFilter filter)
sql.append(super.getFromSQL("X"));
sql.append(" ");

if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE)
if (getContainerFilter() != ContainerFilter.getUnsafeEverythingFilter())
{
SQLFragment joinToExpAnnotSql = new SQLFragment("INNER JOIN ");
joinToExpAnnotSql.append(PanoramaPublicManager.getTableInfoSubmission(), "s");
Expand Down
2 changes: 1 addition & 1 deletion panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ private ExprColumn getAnnouncementIdCol()

// Add a FK lookup so that we can access the "Modified" etc. columns on the "Announcement" table.
announcementCol.setFk(QueryForeignKey.from(getUserSchema(),
ContainerFilter.EVERYTHING_UNSAFE) // Announcements are not in the same container. e.g. on PanoramaWeb they are in "/home/support/panorama public requests"
ContainerFilter.getUnsafeEverythingFilter()) // Announcements are not in the same container. e.g. on PanoramaWeb they are in "/home/support/panorama public requests"
.schema("announcement") // Cannot use CommSchemma.getSchemaName() which returns "comm". This only works if we use "announcement".
// AnnouncementSchema is not part of the LabKey API.
.to("Announcement", // Table name cannot be the plural, "Announcements", returned by CommSchema.getInstance().getTableInfoAnnouncements().getName()
Expand Down
2 changes: 1 addition & 1 deletion panoramapublic/src/org/labkey/panoramapublic/query/JournalExperimentTableInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public SQLFragment getFromSQL(String alias)
sql.append(super.getFromSQL("X"));
sql.append(" ");

if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE)
if (getContainerFilter() != ContainerFilter.getUnsafeEverythingFilter())
{
// Filter on the Container column of the associated ExperimentAnnotations row
SQLFragment joinToExpAnnotSql = new SQLFragment("INNER JOIN ");
Expand Down
2 changes: 1 addition & 1 deletion panoramapublic/src/org/labkey/panoramapublic/query/PanoramaPublicTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public SQLFragment getFromSQL(String alias)
sql.append(super.getFromSQL(TABLE_ALIAS));
sql.append(" ");

if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE)
if (getContainerFilter() != ContainerFilter.getUnsafeEverythingFilter())
{
sql.append(_joinSql.getSQL());
sql.append(" WHERE ");
Expand Down
2 changes: 1 addition & 1 deletion panoramapublic/src/org/labkey/panoramapublic/query/SubmissionTableInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public SQLFragment getFromSQL(String alias)
sql.append(super.getFromSQL("X"));
sql.append(" ");

if (getContainerFilter() != ContainerFilter.EVERYTHING_UNSAFE)
if (getContainerFilter() != ContainerFilter.getUnsafeEverythingFilter())
{
SQLFragment joinSql = new SQLFragment("INNER JOIN ");
joinSql.append(PanoramaPublicManager.getTableInfoJournalExperiment(), "je")
Expand Down