Merge pull request #594 from jooby-project/589

Deadlock with shutdown fix #589

Author: jknack

jooby-ebean/src/main/java/org/jooby/ebean/Ebeanby.java

@@ -149,6 +149,11 @@ public class Ebeanby extends Jdbc {
 
   private Set<String> packages = new HashSet<>();
 
+  static {
+    // Turn off ebean shutdown hook:
+    System.setProperty("ebean.registerShutdownHook", "false");
+  }
+
   /**
    * Creates a new {@link Ebeanby} using the given name to setup a {@link Jdbc} datasource.
    *

jooby-ebean/src/test/java/org/jooby/ebean/Issue589.java

@@ -0,0 +1,27 @@
+package org.jooby.ebean;
+
+import static org.easymock.EasyMock.expect;
+
+import org.jooby.test.MockUnit;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({Ebeanby.class, System.class })
+public class Issue589 {
+
+  @Test
+  public void shouldTurnOffEbeanShutdownHook() throws Exception {
+    new MockUnit()
+        .expect(unit -> {
+          unit.mockStatic(System.class);
+          expect(System.setProperty("ebean.registerShutdownHook", "false")).andReturn(null);
+        })
+        .run(unit -> {
+          new Ebeanby();
+        });
+  }
+
+}