From e51ba56238763df6e0e74338f85b3862587e1b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Holm=20S=C3=B8by?= Date: Wed, 13 Mar 2019 14:59:26 +0100 Subject: [PATCH] rename session to MongoSession i MongoSpec to avoid naming collision using WebRequestUnitTest in grails4/groovy2.5 --- .../src/main/groovy/grails/test/mongodb/MongoSpec.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/grails-plugin/src/main/groovy/grails/test/mongodb/MongoSpec.groovy b/grails-plugin/src/main/groovy/grails/test/mongodb/MongoSpec.groovy index 22528ce2..5452a5ac 100644 --- a/grails-plugin/src/main/groovy/grails/test/mongodb/MongoSpec.groovy +++ b/grails-plugin/src/main/groovy/grails/test/mongodb/MongoSpec.groovy @@ -35,7 +35,7 @@ abstract class MongoSpec extends Specification { MongoDatastore mongoDatastore @Shared - Session session + Session mongoSession /** * @return Obtains the mapping context @@ -104,13 +104,13 @@ abstract class MongoSpec extends Specification { void setup() { boolean existing = mongoDatastore.hasCurrentSession() - session = existing ? mongoDatastore.currentSession : DatastoreUtils.bindSession(mongoDatastore.connect()) + mongoSession = existing ? mongoDatastore.currentSession : DatastoreUtils.bindSession(mongoDatastore.connect()) } void cleanup() { if (!mongoDatastore.hasCurrentSession()) { TransactionSynchronizationManager.unbindResource(mongoDatastore) - DatastoreUtils.closeSessionOrRegisterDeferredClose(session, mongoDatastore) + DatastoreUtils.closeSessionOrRegisterDeferredClose(mongoSession, mongoDatastore) } }