From d8fae6c4d14b1122e9c0a1dde31c53c027dbc425 Mon Sep 17 00:00:00 2001
From: Enrico Colasante <enrico@dhis2.org>
Date: Mon, 27 Sep 2021 16:24:17 +0200
Subject: [PATCH] fix: Fix the way attribute value are updated by hibernate
 session [DHIS2-11852] (#8829)

---
 .../tracker/bundle/persister/AbstractTrackerPersister.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/bundle/persister/AbstractTrackerPersister.java b/dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/bundle/persister/AbstractTrackerPersister.java
index 911fc74d2bee..0d260bb0386f 100644
--- a/dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/bundle/persister/AbstractTrackerPersister.java
+++ b/dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/bundle/persister/AbstractTrackerPersister.java
@@ -338,13 +338,13 @@ protected void handleTrackedEntityAttributeValues( Session session, TrackerPrehe
 
             if ( attributeValue == null )
             {
-                attributeValue = new TrackedEntityAttributeValue();
+                attributeValue = new TrackedEntityAttributeValue()
+                    .setAttribute( attribute )
+                    .setEntityInstance( trackedEntityInstance );
                 isNew = true;
             }
 
             attributeValue
-                .setAttribute( attribute )
-                .setEntityInstance( trackedEntityInstance )
                 .setValue( at.getValue() )
                 .setStoredBy( at.getStoredBy() );