From 355c087a4e325de75692ae6159c94d13fd2c2880 Mon Sep 17 00:00:00 2001 From: Patric Plitzner Date: Mon, 18 Aug 2014 14:53:59 +0000 Subject: [PATCH] - fixed possible IllegalStateException (#4351) --- .../key/polytomous/PolytomousKeyViewPart.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java index e61e15842..6075a5062 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java @@ -91,7 +91,9 @@ public class PolytomousKeyViewPart extends ViewPart implements @Override public void contextStop(IMemento memento, IProgressMonitor monitor) { monitor.subTask("Shutting down Polytomous Key Viewer"); - viewer.setInput(null); + if(!viewer.getControl().isDisposed()){ + viewer.setInput(null); + } } /* (non-Javadoc) @@ -194,7 +196,9 @@ public class PolytomousKeyViewPart extends ViewPart implements conversation = CdmStore.createConversation(); conversation.registerForDataStoreChanges(this); List input = CdmStore.getService(IPolytomousKeyService.class).list(PolytomousKey.class, null, null, null, null); - viewer.setInput(input); + if(!viewer.getControl().isDisposed()){ + viewer.setInput(input); + } } /* (non-Javadoc) @@ -263,7 +267,9 @@ public class PolytomousKeyViewPart extends ViewPart implements //FIXME : Need to make sure this is a stable fix (ticket 3822) getConversationHolder().commit(); List input = CdmStore.getService(IPolytomousKeyService.class).list(PolytomousKey.class, null, null, null, null); - viewer.setInput(input); + if(!viewer.getControl().isDisposed()){ + viewer.setInput(input); + } } public List getKeys() { -- 2.34.1