From f70120d5461959e0fa7abc0bb4382e17885341f1 Mon Sep 17 00:00:00 2001
From: SirWayne <dennis.melzer@bosch-si.com>
Date: Wed, 13 Apr 2016 15:36:14 +0200
Subject: [PATCH 1/2] Set the id after the update

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
---
 .../hawkbit/ui/distributions/dstable/DistributionSetTable.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
index 4e6be369d..998cd1de2 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
@@ -471,9 +471,9 @@ public class DistributionSetTable extends AbstractNamedVersionTable<Distribution
     @Override
     @SuppressWarnings("unchecked")
     protected void updateEntity(final DistributionSet baseEntity, final Item item) {
+        super.updateEntity(baseEntity, item);
         item.getItemProperty(SPUILabelDefinitions.DIST_ID).setValue(baseEntity.getId());
         item.getItemProperty(SPUILabelDefinitions.VAR_IS_DISTRIBUTION_COMPLETE).setValue(baseEntity.isComplete());
-        super.updateEntity(baseEntity, item);
     }
 
     @Override

From 46e71f622d871a99d7e9b9a6a5671581ee600eea Mon Sep 17 00:00:00 2001
From: SirWayne <dennis.melzer@bosch-si.com>
Date: Wed, 13 Apr 2016 15:47:08 +0200
Subject: [PATCH 2/2] Version should be set after id

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
---
 .../hawkbit/ui/common/table/AbstractNamedVersionTable.java      | 2 +-
 .../hawkbit/ui/distributions/dstable/DistributionSetTable.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractNamedVersionTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractNamedVersionTable.java
index b14c69a51..3e215f77c 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractNamedVersionTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractNamedVersionTable.java
@@ -40,8 +40,8 @@ public abstract class AbstractNamedVersionTable<E extends NamedVersionedEntity,
     @SuppressWarnings("unchecked")
     @Override
     protected void updateEntity(final E baseEntity, final Item item) {
-        item.getItemProperty(SPUILabelDefinitions.VAR_VERSION).setValue(baseEntity.getVersion());
         super.updateEntity(baseEntity, item);
+        item.getItemProperty(SPUILabelDefinitions.VAR_VERSION).setValue(baseEntity.getVersion());
     }
 
 }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
index 998cd1de2..4e6be369d 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
@@ -471,9 +471,9 @@ public class DistributionSetTable extends AbstractNamedVersionTable<Distribution
     @Override
     @SuppressWarnings("unchecked")
     protected void updateEntity(final DistributionSet baseEntity, final Item item) {
-        super.updateEntity(baseEntity, item);
         item.getItemProperty(SPUILabelDefinitions.DIST_ID).setValue(baseEntity.getId());
         item.getItemProperty(SPUILabelDefinitions.VAR_IS_DISTRIBUTION_COMPLETE).setValue(baseEntity.isComplete());
+        super.updateEntity(baseEntity, item);
     }
 
     @Override