honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 95861f3e23 into 96e1c2a5db

This commit is contained in:
ArthurCornu 2024-11-07 11:04:18 -05:00 committed by GitHub
parent 96e1c2a5db 95861f3e23
commit aa6f193ced
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java
View File

@ -2022,7 +2022,7 @@ public abstract class BaseHapiFhirResourceDao<T extends IBaseResource> extends B
}
}
final Integer offset = RestfulServerUtils.extractOffsetParameter(theRequest);
final Integer offset = theParams.getOffset() != null ? theParams.getOffset() : RestfulServerUtils.extractOffsetParameter(theRequest);
if (offset != null || !isPagingProviderDatabaseBacked(theRequest)) {
theParams.setLoadSynchronous(true);
if (offset != null) {
@ -2031,7 +2031,7 @@ public abstract class BaseHapiFhirResourceDao<T extends IBaseResource> extends B
theParams.setOffset(offset);
}
Integer count = RestfulServerUtils.extractCountParameter(theRequest);
Integer count = theParams.getCount() != null ? theParams.getCount() : RestfulServerUtils.extractCountParameter(theRequest);
if (count != null) {
Integer maxPageSize = theRequest.getServer().getMaximumPageSize();
if (maxPageSize != null && count > maxPageSize) {