From c3370d30424f60a2a915488699b6aaaf471e7c6d Mon Sep 17 00:00:00 2001
From: Eike Cochu <eike@cochu.com>
Date: Thu, 14 Jan 2016 14:28:21 +0100
Subject: [PATCH] fixed topic query where sortby would be null, which leads to
a npe
---
.../main/java/de/vipra/util/service/DatabaseService.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/vipra-util/src/main/java/de/vipra/util/service/DatabaseService.java b/vipra-util/src/main/java/de/vipra/util/service/DatabaseService.java
index c5a4af26..29dbc66c 100644
--- a/vipra-util/src/main/java/de/vipra/util/service/DatabaseService.java
+++ b/vipra-util/src/main/java/de/vipra/util/service/DatabaseService.java
@@ -3,6 +3,7 @@ package de.vipra.util.service;
import java.util.List;
import org.mongodb.morphia.Datastore;
+import org.mongodb.morphia.query.Query;
import de.vipra.util.Config;
import de.vipra.util.Constants;
@@ -28,7 +29,11 @@ public class DatabaseService<T extends Model> implements Service<T, DatabaseExce
}
public List<T> getMultiple(int skip, int limit, String sortBy) {
- return datastore.createQuery(clazz).offset(skip).limit(limit).order(sortBy).asList();
+ Query<T> q = datastore.createQuery(clazz).offset(skip).limit(limit);
+ if (sortBy != null)
+ q = q.order(sortBy);
+ List<T> list = q.asList();
+ return list;
}
@Override
--
GitLab