merge-update from trunk

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
index 1d383eaceb3230d3ea0478a7b0ce59679fc5a444..a5df6cd3159d2602b3820e4cd3fa70aa25a506df 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
@@ -157,7 +157,13 @@ public class DetailsViewer extends AbstractCdmDataViewer {
        @Override
        protected void markViewPartDirty() {
                if (getInput() instanceof DerivedUnitFacade) {
-            getViewPart().changed(((DerivedUnitFacade) getInput()).innerDerivedUnit());
+                   DerivedUnitFacade facade = (DerivedUnitFacade) getInput();
+                   if(facade.innerDerivedUnit()!=null){
+                       getViewPart().changed(facade.innerDerivedUnit());
+                   }
+                   else if(facade.innerFieldUnit()!=null){
+                       getViewPart().changed(facade.innerFieldUnit());
+                   }
                }
 
                super.markViewPartDirty();