Merge pull request #11254 from demon101/gorm-1216-fix

graemerocher · web-flow · commit 888f0a12df43 · 2019-04-17T12:50:02.000+02:00
duplicate Id field for domain Inheritance
diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsASTUtils.java b/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsASTUtils.java
@@ -203,8 +203,7 @@ public static ClassNode getFurthestParent(ClassNode classNode) {
     public static ClassNode getFurthestUnresolvedParent(ClassNode classNode) {
         ClassNode parent = classNode.getSuperClass();
 
-        while (parent != null && !getFullName(parent).equals("java.lang.Object") &&
-               !parent.isResolved() && !Modifier.isAbstract(parent.getModifiers())) {
+        while (parent != null && !getFullName(parent).equals("java.lang.Object") && !parent.isResolved()) {
             classNode = parent;
             parent = parent.getSuperClass();
         }

Original file line number	Diff line number	Diff line change
`@@ -203,8 +203,7 @@ public static ClassNode getFurthestParent(ClassNode classNode) {`
`203`	`203`	`public static ClassNode getFurthestUnresolvedParent(ClassNode classNode) {`
`204`	`204`	`ClassNode parent = classNode.getSuperClass();`
`205`	`205`
`206`		`- while (parent != null && !getFullName(parent).equals("java.lang.Object") &&`
`207`		`- !parent.isResolved() && !Modifier.isAbstract(parent.getModifiers())) {`
	`206`	`+ while (parent != null && !getFullName(parent).equals("java.lang.Object") && !parent.isResolved()) {`
`208`	`207`	`classNode = parent;`
`209`	`208`	`parent = parent.getSuperClass();`
`210`	`209`	`}`