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 2021/05/14 20:34:45 UTC
[isis] branch master updated: ISIS-2679: fix sortedBy class
serialization issue
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 1363c7a ISIS-2679: fix sortedBy class serialization issue
1363c7a is described below
commit 1363c7a0d3ff7ad7b3e4f6311d71358659fa71fa
Author: ahuber@apache.org <ah...@luna>
AuthorDate: Fri May 14 22:34:24 2021 +0200
ISIS-2679: fix sortedBy class serialization issue
---
.../facets/collections/layout/SortedByFacetForCollectionXml.java | 2 +-
.../org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
index 97756d7..d19c567 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionXml.java
@@ -46,7 +46,7 @@ public class SortedByFacetForCollectionXml extends SortedByFacetAbstract {
return sortedByClass != null
? new SortedByFacetForCollectionXml(uncheckedCast(sortedByClass), holder)
- : null;
+ : null;
}
private SortedByFacetForCollectionXml(Class<? extends Comparator<?>> sortedBy, FacetHolder holder) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java
index 45ab6d4..8cd79de 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java
@@ -253,9 +253,10 @@ public class LayoutFacetUtil {
val sortedByFacet = facetHolder.getFacet(SortedByFacet.class);
if(isDoOp(sortedByFacet)) {
- final Class<? extends Comparator<?>> className = sortedByFacet.value();
- if(className != null) {
- collectionLayoutData.setSortedBy(className.getCanonicalName());
+ final Class<? extends Comparator<?>> cls = sortedByFacet.value();
+ if(cls != null
+ && cls.getCanonicalName()!=null) {
+ collectionLayoutData.setSortedBy(cls.getName());
}
}
}