diff --git a/o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/statement/BaseAction.java b/o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/statement/BaseAction.java index 39f4de34decda38f959d767ace9da13dbe25ee52..d31745f4be41d9e571305aa2a15a2984e4c47189 100644 --- a/o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/statement/BaseAction.java +++ b/o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/statement/BaseAction.java @@ -33,7 +33,7 @@ abstract class BaseAction extends StandardJaxrsAction { }.getType()); } runtime.page = this.adjustPage(page); - runtime.size = this.adjustSize(size); + runtime.size = this.adjustSize2(size); Set keys = runtime.parameters.keySet(); if (keys.contains(Runtime.PARAMETER_PERSON)) { runtime.parameters.put(Runtime.PARAMETER_PERSON, effectivePerson.getDistinguishedName()); @@ -61,4 +61,10 @@ abstract class BaseAction extends StandardJaxrsAction { } return runtime; } + + public Integer adjustSize2(Integer pageSize) { + return (pageSize == null || pageSize < 1) + ? EntityManagerContainer.DEFAULT_PAGESIZE.intValue() + : pageSize; + } }