avoid NPE in state comparat

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RowWrapperDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RowWrapperDTO.java
index 5371f807c45728dbb0ac42a85c8f81a21e4adc40..a5714cf2755c3e067e13721c055d6d6b69bd0ffb 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RowWrapperDTO.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RowWrapperDTO.java
@@ -124,6 +124,15 @@ public abstract class RowWrapperDTO <T extends DescriptionBase> implements Seria
                     if (h1.getCount() != null && h2.getCount() != null && h1.getCount() != h2.getCount()){
                         return -h1.getCount().compareTo(h2.getCount());
                     }
+                    if (h1.getState() == h2.getState()){
+                        return 0;
+                    }
+                    if (h1.getState() == null){
+                        return -1;
+                    }
+                    if (h2.getState() == null){
+                        return 1;
+                    }
                     return h1.getState().getTitleCache().compareTo(h2.getState().getTitleCache());
                 }
             });