You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/01/29 20:23:31 UTC
[isis] branch master updated: ISIS-2158: wicket collection view:
fix NPE on column sorting
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 25b3f00 ISIS-2158: wicket collection view: fix NPE on column sorting
25b3f00 is described below
commit 25b3f008abbdb98c7aa424946f6acba3634abb21
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 29 21:23:20 2020 +0100
ISIS-2158: wicket collection view: fix NPE on column sorting
---
.../ajaxtable/CollectionContentsSortableDataProvider.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
index 510a3bf..5fb8758 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
@@ -180,8 +180,8 @@ public class CollectionContentsSortableDataProvider extends SortableDataProvider
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public int compare(ManagedObject p, ManagedObject q) {
- val pPojo = p.getPojo();
- val qPojo = q.getPojo();
+ val pPojo = ManagedObject.unwrapSingle(p);
+ val qPojo = ManagedObject.unwrapSingle(q);
if(!(pPojo instanceof Comparable) || !(qPojo instanceof Comparable)) {
return 0;
}