Skip to content
Open
Changes from all commits
Commits
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
22 changes: 13 additions & 9 deletions server/src/com/mirth/connect/client/core/Client.java
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,19 @@
import com.mirth.connect.util.messagewriter.EncryptionType;
import com.mirth.connect.util.messagewriter.MessageWriterOptions;

public class Client implements UserServletInterface, ConfigurationServletInterface, ChannelServletInterface, ChannelGroupServletInterface, ChannelStatusServletInterface, ChannelStatisticsServletInterface, EngineServletInterface, MessageServletInterface, EventServletInterface, AlertServletInterface, CodeTemplateServletInterface, DatabaseTaskServletInterface, UsageServletInterface, ExtensionServletInterface {
public class Client implements UserServletInterface, ConfigurationServletInterface, ChannelServletInterface,
ChannelGroupServletInterface, ChannelStatusServletInterface, ChannelStatisticsServletInterface,
EngineServletInterface, MessageServletInterface, EventServletInterface, AlertServletInterface,
CodeTemplateServletInterface, DatabaseTaskServletInterface, UsageServletInterface, ExtensionServletInterface,
AutoCloseable {

public static final int MAX_QUERY_PARAM_COLLECTION_SIZE = 100;

private Logger logger = LogManager.getLogger(this.getClass());
private ServerConnection serverConnection;
private javax.ws.rs.client.Client client;
private URI api;
private AtomicBoolean closed = new AtomicBoolean(false);
private final Logger logger = LogManager.getLogger(this.getClass());
private final ServerConnection serverConnection;
private final javax.ws.rs.client.Client client;
private final URI api;
private final AtomicBoolean closed = new AtomicBoolean(false);
private InvocationHandlerRecorder recorder;

/**
Expand Down Expand Up @@ -312,9 +316,9 @@ public void setRecorder(InvocationHandlerRecorder recorder) {
this.recorder = recorder;
}

@Override
public void close() {
closed.set(true);
if (serverConnection != null) {
if (!closed.getAndSet(true)) {
serverConnection.shutdown();
client.close();
}
Expand Down Expand Up @@ -2675,4 +2679,4 @@ public void setPluginProperties(String extensionName, Properties properties, boo
public String getProperty(String group, String name) throws ClientException {
return getServlet(ConfigurationServletInterface.class).getProperty(group, name);
}
}
}