From: n.hoffmann Date: Wed, 7 Sep 2011 09:35:02 +0000 (+0000) Subject: Quickfix for a non critical problem that surfaces when changing an accepted taxon... X-Git-Tag: 3.6.0~1179 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/6f62321159ceeeefbfaf40fc56ab6f749f12dd02 Quickfix for a non critical problem that surfaces when changing an accepted taxon to a synonym --- diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java index 184e01da7..94643dbcc 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java @@ -46,6 +46,10 @@ public class MediaContentProvider implements ITreeContentProvider{ if (parentElement instanceof TaxonEditorInput) { Taxon taxon = ((TaxonEditorInput) parentElement).getTaxon(); + if(taxon == null){ + EditorUtil.error(getClass(), "Taxon is null", null); + return NO_CHILDREN; + } HashSet imageGalleries = new HashSet(); for(DescriptionBase description : taxon.getDescriptions()){ if(description.isImageGallery()){