Skip to content

Fix #132: Implemented proper synchronization of executorService in InetUtils #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spencergibb merged 1 commit into from
Oct 6, 2016
Merged

Fix #132: Implemented proper synchronization of executorService in InetUtils #133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 13 additions & 30 deletions spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/InetUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,44 +25,27 @@
public class InetUtils implements Closeable {

// TODO: maybe shutdown the thread pool if it isn't being used?
private static ExecutorService executorService;
private final ExecutorService executorService;
private final InetUtilsProperties properties;
private static final InetUtils instance = new InetUtils(new InetUtilsProperties());

public InetUtils(final InetUtilsProperties properties) {
this.properties = properties;
this.executorService = Executors
.newSingleThreadExecutor(new ThreadFactory() {
@Override
public Thread newThread(Runnable r) {
Thread thread = new Thread(r);
thread.setName(InetUtilsProperties.PREFIX);
thread.setDaemon(true);
return thread;
}
});
}

@Override
public void close() {
if (executorService != null) {
synchronized (InetUtils.class) {
if (executorService != null) {
executorService.shutdown();
executorService = null;
}
}
}
}

private ExecutorService getExecutor() {
if (executorService == null) {
synchronized (InetUtils.class) {
if (executorService == null) {
executorService = Executors
.newSingleThreadExecutor(new ThreadFactory() {
@Override
public Thread newThread(Runnable r) {
Thread thread = new Thread(r);
thread.setName(InetUtilsProperties.PREFIX);
thread.setDaemon(true);
return thread;
}
});
}
}
}
return executorService;
executorService.shutdown();
}

public HostInfo findFirstNonLoopbackHostInfo() {
Expand Down Expand Up @@ -156,7 +139,7 @@ else if (result != null) {

public HostInfo convertAddress(final InetAddress address) {
HostInfo hostInfo = new HostInfo();
Future<String> result = getExecutor().submit(new Callable<String>() {
Future<String> result = executorService.submit(new Callable<String>() {
@Override
public String call() throws Exception {
return address.getHostName();
Expand Down