DI improvement

jeffscottbrown · jeffscottbrown · commit fbadfb9e571e · 2012-03-15T10:57:12.000-05:00
diff --git a/src/java/org/codehaus/groovy/grails/web/plugins/support/WebMetaUtils.groovy b/src/java/org/codehaus/groovy/grails/web/plugins/support/WebMetaUtils.groovy
@@ -99,10 +99,10 @@ class WebMetaUtils {
                             }
                         }
 
+                        def newCommandObject = false
                         if (!commandObject) {
                             commandObject = paramType.newInstance()
-                            ctx.autowireCapableBeanFactory?.autowireBeanProperties(
-                                commandObject, AutowireCapableBeanFactory.AUTOWIRE_BY_NAME, false)
+                            newCommandObject = true
                             commandObjects << commandObject
                         }
 
@@ -121,6 +121,11 @@ class WebMetaUtils {
                                 constrainedProperty.getPropertyName()), errors)
                         }
                         commandObject.errors = errors
+                        
+                        if(newCommandObject) {
+                            ctx.autowireCapableBeanFactory?.autowireBeanProperties(
+                                commandObject, AutowireCapableBeanFactory.AUTOWIRE_BY_NAME, false)
+                        }
                     }
                     catch (Exception e) {
                         throw new ControllerExecutionException("Error occurred creating command object.", e)

Original file line number	Diff line number	Diff line change
`@@ -99,10 +99,10 @@ class WebMetaUtils {`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
	`102`	`+ def newCommandObject = false`
`102`	`103`	`if (!commandObject) {`
`103`	`104`	`commandObject = paramType.newInstance()`
`104`		`- ctx.autowireCapableBeanFactory?.autowireBeanProperties(`
`105`		`- commandObject, AutowireCapableBeanFactory.AUTOWIRE_BY_NAME, false)`
	`105`	`+ newCommandObject = true`
`106`	`106`	`commandObjects << commandObject`
`107`	`107`	`}`
`108`	`108`
`@@ -121,6 +121,11 @@ class WebMetaUtils {`
`121`	`121`	`constrainedProperty.getPropertyName()), errors)`
`122`	`122`	`}`
`123`	`123`	`commandObject.errors = errors`
	`124`	`+`
	`125`	`+ if(newCommandObject) {`
	`126`	`+ ctx.autowireCapableBeanFactory?.autowireBeanProperties(`
	`127`	`+ commandObject, AutowireCapableBeanFactory.AUTOWIRE_BY_NAME, false)`
	`128`	`+ }`
`124`	`129`	`}`
`125`	`130`	`catch (Exception e) {`
`126`	`131`	`throw new ControllerExecutionException("Error occurred creating command object.", e)`