Project

General

Profile

« Previous | Next » 

Revision b84547d8

Added by Patrick Plitzner almost 5 years ago

Fix infinite loop when moving terms with parent terms

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermDropAdapterE4.java
93 93
                }
94 94

  
95 95
                TermDto partOfDto = parentTerm.getPartOfDto();
96
                while(partOfDto!=null){
97
                    if(partOfDto.equals(droppedObject)){
98
                        MessagingUtils.warningDialog(MOVE_FAILED, this.getClass(),
99
                                MOVE_FAILED_MESSAGE);
100
                        return false;
101
                    }
96
                if(partOfDto!=null && partOfDto.equals(droppedObject)){
97
                    MessagingUtils.warningDialog(MOVE_FAILED, this.getClass(),
98
                            MOVE_FAILED_MESSAGE);
99
                    return false;
102 100
                }
103 101
                TermDto kindOfDto = parentTerm.getKindOfDto();
104
                while(kindOfDto!=null){
105
                    if(kindOfDto.equals(droppedObject)){
106
                        MessagingUtils.warningDialog(MOVE_FAILED, this.getClass(),
107
                                MOVE_FAILED_MESSAGE);
108
                        return false;
109
                    }
102
                if(kindOfDto!=null && kindOfDto.equals(droppedObject)){
103
                    MessagingUtils.warningDialog(MOVE_FAILED, this.getClass(),
104
                            MOVE_FAILED_MESSAGE);
105
                    return false;
110 106
                }
111 107
            }
112 108
            else if(target instanceof TermVocabularyDto){

Also available in: Unified diff