From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Thu, 19 Jun 2014 07:06:57 +0000 (+0000)
Subject:  - fixed potential NPE
X-Git-Tag: 3.6.0~550
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/b3531195a8cc9134cdfa81587d8fd73fcccb2aba

 - fixed potential NPE
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataController.java
index d085ec332..226780811 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataController.java
@@ -66,7 +66,10 @@ public class OriginalLabelDataController extends AbstractCdmDetailElement<Derive
      */
     @Override
     protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) {
-        originalLabelDataElement.getText().setText(entity.getTitleCache());
+        String originalLabelInfo = entity.innerDerivedUnit().getOriginalLabelInfo();
+        if(originalLabelInfo!=null){
+            originalLabelDataElement.getText().setText(originalLabelInfo);
+        }
     }
 
     /* (non-Javadoc)