refix-for-GRAILS-5264-the-suffix-instance-of-domain-.patch

diff --git a/grails/src/java/org/codehaus/groovy/grails/scaffolding/DefaultGrailsTemplateGenerator.groovy b/grails/src/java/org/codehaus/groovy/grails/scaffolding/DefaultGrailsTemplateGenerator.groovy
index 02e0335..518d059 100644
--- a/grails/src/java/org/codehaus/groovy/grails/scaffolding/DefaultGrailsTemplateGenerator.groovy
+++ b/grails/src/java/org/codehaus/groovy/grails/scaffolding/DefaultGrailsTemplateGenerator.groovy
@@ -57,11 +57,10 @@ class DefaultGrailsTemplateGenerator implements GrailsTemplateGenerator, Resourc
      */
     DefaultGrailsTemplateGenerator(ClassLoader classLoader) {
         engine = new SimpleTemplateEngine(classLoader)        
-        def suffix = ConfigurationHolder.config?.grails?.templates?.domainSuffix
-        if (suffix == [:]) { // default for compatibility
-            suffix = 'Instance'
+        def suffix = ConfigurationHolder.config?.grails?.scaffolding?.templates?.domainSuffix
+        if (suffix != [:]) {
+            domainSuffix = suffix
         }
-        domainSuffix = suffix ?: 'Instance'
     }
 
     /**