ref #6315: avoid NPE if new entity is created from filteredSelectionDialog called...

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
index 54d4956feb27fda8df1edff992ccbf0f59e886c8..a6ec94c170de6d86d423beb86ca5a7e69a7f1988 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
@@ -499,10 +499,14 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
                                       // model.add(new UuidAndTitleCache<T>(entity.getUuid(), entity.getId(), getTitle(entity)));
                                        refresh();
                                        setPattern(entity);
-                                       getConversationHolder().bind();
+                                       if (getConversationHolder() != null){
+                                           getConversationHolder().bind();
+                                       }
                                    }
                                    //FIXME : Need to make sure this is a stable fix (ticket 3822)
-                                   getConversationHolder().commit();
+                                   if (getConversationHolder() != null){
+                                       getConversationHolder().commit();
+                                   }
                                }
                            }
                        }