fix #6061: add a null check for abbrevTitleCache and titleCache in comparator

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / dialog / selection / NomenclaturalAuthorSelectionDialog.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorSelectionDialog.java
index 7fb99183a2a453c205df9013a14912fd8daa6ef7..96104ab299f3e59aa2ad66e446b832eced264c1f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorSelectionDialog.java
@@ -215,7 +215,25 @@ public class NomenclaturalAuthorSelectionDialog extends AgentSelectionDialog {
                        public int compare(UuidAndTitleCache entity1,
                                        UuidAndTitleCache entity2) {
                                Collator collator = Collator.getInstance();
-                               return collator.compare(entity1.getAbbrevTitleCache(), entity2.getAbbrevTitleCache());
+                               String compareString1 = "";
+                               if (entity1.getAbbrevTitleCache() != null){
+                                       compareString1 = entity1.getAbbrevTitleCache();
+                               }
+                               if (entity1.getTitleCache() != null){
+                                       compareString1 += entity1.getTitleCache();
+                               }
+                               
+                               
+                               String compareString2 = "";
+                               if (entity2.getAbbrevTitleCache() != null){
+                                       compareString2 = entity2.getAbbrevTitleCache();
+                               }
+                               if (entity2.getTitleCache() != null){
+                                       compareString2 += entity2.getTitleCache();
+                               }
+                               
+                               
+                               return collator.compare(compareString1, compareString2);
                        }
                };
        }