Projects >> grails-core >>8ed9e292aa553fe9eeaa85f2a2c8ca457a8d3c9b

Chunk
Conflicting content
        CLASS_NODE_TO_WHITE_LIST_PROPERTY_NAMES.put(classNode, propertyNamesToIncludeInWhiteList);
        Map allAssociationMap = GrailsASTUtils.getAllAssociationMap(classNode);
        for (String associationName : allAssociationMap.keySet()) {
<<<<<<< HEAD
            if (!propertyNamesToIncludeInWhiteList.contains(associationName)) {
=======
            if(!propertyNamesToIncludeInWhiteList.contains(associationName) && !unbindablePropertyNames.contains(associationName)) {
>>>>>>> 549aa8c9adc454157c219ca89a18bde79b088a56
                propertyNamesToIncludeInWhiteList.add(associationName);
            }
        }
Solution content
        CLASS_NODE_TO_WHITE_LIST_PROPERTY_NAMES.put(classNode, propertyNamesToIncludeInWhiteList);
        Map allAssociationMap = GrailsASTUtils.getAllAssociationMap(classNode);
        for (String associationName : allAssociationMap.keySet()) {
            if(!propertyNamesToIncludeInWhiteList.contains(associationName) && !unbindablePropertyNames.contains(associationName)) {
                propertyNamesToIncludeInWhiteList.add(associationName);
            }
        }
File
DefaultASTDatabindingHelper.java
Developer's decision
Version 2
Kind of conflict
If statement