https://github.com/javers/javers/issues/1030

javers · Oct 23, 2020 · c47f018 · c47f018
1 parent ed5f018
commit c47f018
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/javers-core/src/main/java/org/javers/common/collections/Lists.java b/javers-core/src/main/java/org/javers/common/collections/Lists.java
@@ -16,7 +16,7 @@
 public class Lists {
 
     public static List wrapNull(Object list) {
-        if (list == null || list == MissingProperty.INSTANCE) {
+        if (list == null || list == MissingProperty.INSTANCE || !(list instanceof List)) {
             return Collections.emptyList();
         }
         return (List)list;

diff --git a/javers-core/src/main/java/org/javers/common/collections/Maps.java b/javers-core/src/main/java/org/javers/common/collections/Maps.java
@@ -13,7 +13,7 @@
 public class Maps {
 
     public static Map wrapNull(Object map){
-        if (map == null || map == MissingProperty.INSTANCE){
+        if (map == null || map == MissingProperty.INSTANCE || !(map instanceof Map)){
             return Collections.emptyMap();
         }
         return (Map)map;

diff --git a/javers-core/src/main/java/org/javers/common/collections/Sets.java b/javers-core/src/main/java/org/javers/common/collections/Sets.java
@@ -21,7 +21,7 @@ private Sets() {
 
 
     public static Set wrapNull(Object set) {
-        if (set == null || set == MissingProperty.INSTANCE) {
+        if (set == null || set == MissingProperty.INSTANCE || !(set instanceof Set)) {
             return Collections.emptySet();
         }
         return (Set) set;