From 8d8db03d7b0e76557888261b725ed9ffe97bfcf6 Mon Sep 17 00:00:00 2001
From: Patrick Plitzner
Date: Wed, 7 Oct 2015 17:32:02 +0200
Subject: [PATCH] Fix potential NPE
---
.../view/derivateSearch/DerivateLabelProvider.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
index 7b9a8d063..9db13819c 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
@@ -151,7 +151,9 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
derivate = node.getValue();
}
- conversation.bind();
+ if(conversation!=null){
+ conversation.bind();
+ }
final String emptyString = "";
final String separator = " ";
@@ -348,7 +350,7 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
}
else if(cdmBase.isInstanceOf(SingleRead.class)){
- if(multiLinkSingleReads.contains(element)){
+ if(multiLinkSingleReads!=null && multiLinkSingleReads.contains(element)){
return ImageResources.getImage(ImageResources.SINGLE_READ_DERIVATE_MULTILINK);
}
else{
--
2.34.1