Merge branch '1.3.x' of github.com:grails/grails-core into 1.3.x

jeffscottbrown · jeffscottbrown · commit e4020e73ea12 · 2010-12-13T08:50:14.000-06:00
diff --git a/scripts/_GrailsTest.groovy b/scripts/_GrailsTest.groovy
@@ -294,11 +294,13 @@ runTests = { GrailsTestType type, File compiledClassesDir ->
 }
 
 initPersistenceContext = {
-    appCtx.getBeansOfType(PersistenceContextInterceptor).values()*.init()
+	if(appCtx != null)
+    	appCtx.getBeansOfType(PersistenceContextInterceptor).values()*.init()
 }
 
-destroyPersistenceContext = {
-    appCtx.getBeansOfType(PersistenceContextInterceptor).values()*.destroy()
+destroyPersistenceContext = {	
+	if(appCtx != null)
+    	appCtx.getBeansOfType(PersistenceContextInterceptor).values()*.destroy()
 }
 
 unitTestPhasePreparation = {}

Original file line number	Diff line number	Diff line change
`@@ -294,11 +294,13 @@ runTests = { GrailsTestType type, File compiledClassesDir ->`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`initPersistenceContext = {`
`297`		`- appCtx.getBeansOfType(PersistenceContextInterceptor).values()*.init()`
	`297`	`+ if(appCtx != null)`
	`298`	`+ appCtx.getBeansOfType(PersistenceContextInterceptor).values()*.init()`
`298`	`299`	`}`
`299`	`300`
`300`		`-destroyPersistenceContext = {`
`301`		`- appCtx.getBeansOfType(PersistenceContextInterceptor).values()*.destroy()`
	`301`	`+destroyPersistenceContext = {`
	`302`	`+ if(appCtx != null)`
	`303`	`+ appCtx.getBeansOfType(PersistenceContextInterceptor).values()*.destroy()`
`302`	`304`	`}`
`303`	`305`
`304`	`306`	`unitTestPhasePreparation = {}`