Skip to content

Commit 97696ef

Browse files
Fix Issue576 unit test.
1 parent f5fcdd7 commit 97696ef

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

jooby/src/main/java/org/jooby/internal/ServerExecutorProvider.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
package org.jooby.internal;
2020

2121
import com.google.common.util.concurrent.MoreExecutors;
22+
import com.google.inject.Inject;
2223
import org.jooby.spi.Server;
2324

24-
import javax.inject.Inject;
2525
import javax.inject.Provider;
2626
import java.util.concurrent.Executor;
2727

@@ -32,14 +32,23 @@ public class ServerExecutorProvider implements Provider<Executor> {
3232
private Executor executor;
3333

3434
@Inject
35-
public ServerExecutorProvider(final Server server) {
36-
executor = requireNonNull(server, "Server is required.")
37-
.executor().orElse(MoreExecutors.directExecutor());
35+
public ServerExecutorProvider(final ServerHolder serverHolder) {
36+
requireNonNull(serverHolder, "Server holder is required.");
37+
38+
executor = (serverHolder.server != null) ?
39+
serverHolder.server.executor().orElse(MoreExecutors.directExecutor()) :
40+
MoreExecutors.directExecutor();
3841
}
3942

4043
@Override
4144
public Executor get() {
4245
return executor;
4346
}
4447

48+
static class ServerHolder {
49+
50+
@Inject(optional = true) Server server = null;
51+
52+
}
53+
4554
}

0 commit comments

Comments
 (0)