Revision a86e2c4a
Added by Patrick Plitzner over 6 years ago
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java | ||
---|---|---|
91 | 91 |
default: |
92 | 92 |
break; |
93 | 93 |
} |
94 |
derivativeEditor.getCdmEntitySession().dispose(); |
|
95 |
derivativeEditor.getCdmEntitySession().bind(); |
|
94 |
if(derivativeEditor.getCdmEntitySession()!=null){ |
|
95 |
derivativeEditor.getCdmEntitySession().dispose(); |
|
96 |
derivativeEditor.getCdmEntitySession().bind(); |
|
97 |
} |
|
96 | 98 |
|
97 | 99 |
SearchManager searchManager = new SearchManager(); |
98 | 100 |
List<SpecimenOrObservationBase> occurrences = searchManager.findOccurrences(config, true); |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPersistentPostOperation.java | ||
---|---|---|
127 | 127 |
*/ |
128 | 128 |
public void bind(){ |
129 | 129 |
conversationEnabled.getConversationHolder().bind(); |
130 |
if(getCdmEntitySessionEnabled() != null) { |
|
130 |
if(getCdmEntitySessionEnabled() != null && getCdmEntitySessionEnabled().getCdmEntitySession()!=null) {
|
|
131 | 131 |
getCdmEntitySessionEnabled().getCdmEntitySession().bind(); |
132 | 132 |
} |
133 | 133 |
} |
Also available in: Unified diff
Fix potential NPE