From b84547d81eefb6fa87465f2478abb0c2ad0cf2d6 Mon Sep 17 00:00:00 2001 From: Patrick Plitzner Date: Tue, 7 May 2019 16:17:20 +0200 Subject: [PATCH] Fix infinite loop when moving terms with parent terms --- .../e4/DefinedTermDropAdapterE4.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermDropAdapterE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermDropAdapterE4.java index fb77f2560..6e7d9167e 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermDropAdapterE4.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermDropAdapterE4.java @@ -93,20 +93,16 @@ public class DefinedTermDropAdapterE4 extends EditViewerDropAdapter { } TermDto partOfDto = parentTerm.getPartOfDto(); - while(partOfDto!=null){ - if(partOfDto.equals(droppedObject)){ - MessagingUtils.warningDialog(MOVE_FAILED, this.getClass(), - MOVE_FAILED_MESSAGE); - return false; - } + if(partOfDto!=null && partOfDto.equals(droppedObject)){ + MessagingUtils.warningDialog(MOVE_FAILED, this.getClass(), + MOVE_FAILED_MESSAGE); + return false; } TermDto kindOfDto = parentTerm.getKindOfDto(); - while(kindOfDto!=null){ - if(kindOfDto.equals(droppedObject)){ - MessagingUtils.warningDialog(MOVE_FAILED, this.getClass(), - MOVE_FAILED_MESSAGE); - return false; - } + if(kindOfDto!=null && kindOfDto.equals(droppedObject)){ + MessagingUtils.warningDialog(MOVE_FAILED, this.getClass(), + MOVE_FAILED_MESSAGE); + return false; } } else if(target instanceof TermVocabularyDto){ -- 2.34.1