jdaugherty commented on code in PR #15683:
URL: https://github.com/apache/grails-core/pull/15683#discussion_r3343222012


##########
grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/base/GrailsDataTckManager.groovy:
##########
@@ -56,34 +31,36 @@ abstract class GrailsDataTckManager {
 
     abstract Session createSession()
 
-    List<Class> domainClasses = [
-            Book,
-            ChildEntity,
-            City,
-            ClassWithListArgBeforeValidate,
-            ClassWithNoArgBeforeValidate,
-            ClassWithOverloadedBeforeValidate,
-            CommonTypes,
-            Country,
-            EnumThing,
-            Face,
-            Highway,
-            Location,
-            ModifyPerson,
-            Nose,
-            OptLockNotVersioned,
-            OptLockVersioned,
-            Person,
-            PersonEvent,
-            Pet,
-            PetType,
-            Plant,
-            PlantCategory,
-            Publication,
-            Task,
-            TestEntity
+    private List<Class> domainClasses = [
     ]
 
+/**
+ * Returns a defensive copy of the registered domain classes.
+ * Mutating this array will not affect the manager state.
+ */
+    Class[] getDomainClasses() {
+        return domainClasses as Class[]

Review Comment:
   This happens when there is a three way merge.  That's why you want to create 
pull requests that have ancestors instead of multiple sources.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to