Changeset 5154

Timestamp:

05/08/14 09:13:24 (10 years ago)

Author:

Twan Goosen

Message:

fixed a serialization issue with partitioned data provider

Location:

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider

Files:

• FacetFieldValuesProvider.java (modified) (2 diffs)
• PartitionedDataProvider.java (modified) (2 diffs)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProvider.java

@@ -20 +20 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
 import eu.clarin.cmdi.vlo.pojo.FieldValuesFilter;
@@ -125 +126 @@
         final ImmutableList sorted = getOrdering().immutableSortedCopy(filteredValues);
         if (sorted.size() > maxNumberOfItems) {
-            return sorted.subList(0, maxNumberOfItems);
+            return Lists.newArrayList(sorted.subList(0, maxNumberOfItems));
         } else {
             // return iterator starting at specified offset

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/PartitionedDataProvider.java

@@ -27 +27 @@
 
 /**
- * Wrapper for a sortable data provider that partitions the returned data in sublist of a
- * predefined maximum size
+ * Wrapper for a sortable data provider that partitions the returned data in
+ * sublist of a predefined maximum size
  *
  * @author twagoo
@@ -92 +92 @@
     @Override
     public IModel<List<? extends T>> model(List<? extends T> object) {
-        return Model.ofList(object);
+        // Iterators.partition sometimes returns lists that are not deeply serializable, 
+        // so we need to copy this into a serializable list here :(
+        return Model.ofList(ImmutableList.copyOf(object));
     }