fix failing tests

fernando88to · Mar 27, 2015 · 834cd77 · 834cd77
1 parent db90b75
commit 834cd77
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/grails-plugin-events/src/main/groovy/org/grails/plugins/events/EventBusGrailsPlugin.groovy b/grails-plugin-events/src/main/groovy/org/grails/plugins/events/EventBusGrailsPlugin.groovy
@@ -56,14 +56,18 @@ class EventBusGrailsPlugin extends Plugin {
     @Override
     @CompileStatic
     void doWithApplicationContext() {
-        Environment.assign applicationContext.getBean('reactorEnv', Environment)
+        if( !Environment.alive() ) {
+            Environment.assign applicationContext.getBean('reactorEnv', Environment)
+        }
     }
 
     @Override
     @CompileStatic
     void onShutdown(Map<String, Object> event) {
         try {
-            Environment.terminate()
+            if( Environment.alive() ) {
+                Environment.terminate()
+            }
         } catch (Throwable e) {
             log.warn("Error shutting down Reactor: ${e.message}", e)
         }