fix: Bug where merge was not applied to registered record, and registered record was overwritten by new registration

JonnyPower · JonnyPower · commit fea8037c57f9 · 2018-03-11T21:30:29.000-07:00
diff --git a/fflib/src/classes/fflib_SObjectUnitOfWork.cls b/fflib/src/classes/fflib_SObjectUnitOfWork.cls
@@ -280,9 +280,9 @@ public virtual class fflib_SObjectUnitOfWork
             for (SObjectField dirtyField : dirtyFields) {
                 registeredRecord.put(dirtyField, record.get(dirtyField));
             }
-        }
 
-        m_dirtyMapByType.get(sObjectType).put(record.Id, record);
+            m_dirtyMapByType.get(sObjectType).put(record.Id, registeredRecord);
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -280,9 +280,9 @@ public virtual class fflib_SObjectUnitOfWork`
`280`	`280`	`for (SObjectField dirtyField : dirtyFields) {`
`281`	`281`	`registeredRecord.put(dirtyField, record.get(dirtyField));`
`282`	`282`	`}`
`283`		`- }`
`284`	`283`
`285`		`- m_dirtyMapByType.get(sObjectType).put(record.Id, record);`
	`284`	`+ m_dirtyMapByType.get(sObjectType).put(record.Id, registeredRecord);`
	`285`	`+ }`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`/**`