Skip to content
Snippets Groups Projects

Fix sort order checking to not always return NONE

Merged Martin Lowe requested to merge malowe/eclipsefdn-api-common:malowe/master/sort_fix into master
1 file
+ 1
1
Compare changes
  • Side-by-side
  • Inline
@@ -73,7 +73,7 @@ public class RDBMSQuery<T extends BareNode> {
@@ -73,7 +73,7 @@ public class RDBMSQuery<T extends BareNode> {
String orderValRaw = params.getFirst(PersistenceUrlParameterNames.ORDER.getName());
String orderValRaw = params.getFirst(PersistenceUrlParameterNames.ORDER.getName());
String orderVal = orderValRaw == null ? SortOrder.ASCENDING.name(): orderValRaw;
String orderVal = orderValRaw == null ? SortOrder.ASCENDING.name(): orderValRaw;
if (sortVal != null) {
if (sortVal != null) {
SortOrder ord = SortOrder.getOrderFromValue(orderVal);
SortOrder ord = SortOrder.getOrderByName(orderVal);
// check if the sort string matches the RANDOM sort order
// check if the sort string matches the RANDOM sort order
if (SortOrder.RANDOM.equals(ord)) {
if (SortOrder.RANDOM.equals(ord)) {
filter.setOrder(SortOrder.RANDOM);
filter.setOrder(SortOrder.RANDOM);
Loading