Skip to content

[bot] Fast-forward for 24.11.17 #7341

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
github-actions merged 3 commits into from
Jan 19, 2026
Merged

[bot] Fast-forward for 24.11.17 #7341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11bb415
Add EHRComplianceDBTemplateType (#6644)
labkey-martyp May 8, 2025
4e9a632
Add trace logging to client abort exception (#6958)
labkey-martyp Aug 25, 2025
764819f
Fix filter for data/material input (#7322)
labkey-nicka Jan 15, 2026
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
7 changes: 7 additions & 0 deletions api/schemas/domainTemplate.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,4 +192,11 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>

<xs:complexType name="EHRComplianceDBTemplateType">
<xs:complexContent>
<xs:extension base="DomainTemplateType">
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:schema>
6 changes: 5 additions & 1 deletion api/src/org/labkey/api/util/ExceptionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,6 @@ protected void renderView(Object model, HttpServletRequest request, HttpServletR
}
}


public static boolean isClientAbortException(Throwable ex)
{
if (ex != null)
Expand All @@ -643,6 +642,7 @@ public static boolean isClientAbortException(Throwable ex)
className.endsWith("ClientAbortException") ||
className.endsWith("FileUploadException"))
{
LOG.trace("Client abort exception", ex);
return true;
}
if (ex.getClass().equals(IllegalStateException.class) && ex.getMessage() != null &&
Expand All @@ -651,20 +651,24 @@ public static boolean isClientAbortException(Throwable ex)
ex.getMessage().contains("Session already invalidated")))

{
LOG.trace("Client abort exception", ex);
return true;
}
if (ex.getClass().equals(SocketException.class) && "Connection reset".equalsIgnoreCase(ex.getMessage()))
{
LOG.trace("Client abort exception", ex);
return true;
}
// Bug 15371 and 34605
if (ex.getClass().equals(IOException.class) && ex.getMessage() != null && (ex.getMessage().contains("disconnected client") || ex.getMessage().contains("Socket read failed")))
{
LOG.trace("Client abort exception", ex);
return true;
}
// Bug 32056
if (ex.getClass().equals(EOFException.class))
{
LOG.trace("Client abort exception", ex);
return true;
}

Expand Down
4 changes: 2 additions & 2 deletions experiment/src/org/labkey/experiment/api/ExpProtocolApplicationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ private long deleteDataInputs()
OntologyManager.deleteOntologyObjects(svc.getSchema(), new SQLFragment("SELECT " +
dialect.concatenate("'" + DataInput.lsidPrefix() + "'",
"CAST(dataId AS VARCHAR)", "'.'", "CAST(targetApplicationId AS VARCHAR)") +
" FROM " + svc.getTinfoDataInput() + " WHERE TargetApplicationId IN (SELECT RowId FROM exp.ProtocolApplication WHERE RunId = " + getRowId() + ")"), getContainer());
" FROM " + svc.getTinfoDataInput() + " WHERE TargetApplicationId = ?", getRowId()), getContainer());

return Table.delete(ExperimentServiceImpl.get().getTinfoDataInput(), new SimpleFilter(FieldKey.fromParts("TargetApplicationId"), getRowId()));
}
Expand All @@ -413,7 +413,7 @@ private long deleteMaterialInputs()
OntologyManager.deleteOntologyObjects(svc.getSchema(), new SQLFragment("SELECT " +
dialect.concatenate("'" + MaterialInput.lsidPrefix() + "'",
"CAST(materialId AS VARCHAR)", "'.'", "CAST(targetApplicationId AS VARCHAR)") +
" FROM " + svc.getTinfoMaterialInput() + " WHERE TargetApplicationId IN (SELECT RowId FROM exp.ProtocolApplication WHERE RunId = " + getRowId() + ")"), getContainer());
" FROM " + svc.getTinfoMaterialInput() + " WHERE TargetApplicationId = ?", getRowId()), getContainer());

return Table.delete(ExperimentServiceImpl.get().getTinfoMaterialInput(), new SimpleFilter(FieldKey.fromParts("TargetApplicationId"), getRowId()));
}
Expand Down