lewismc closed pull request #17: SDAP-72
URL: https://github.com/apache/incubator-sdap-mudrod/pull/17
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/core/src/main/java/org/apache/sdap/mudrod/driver/ESDriver.java
b/core/src/main/java/org/apache/sdap/mudrod/driver/ESDriver.java
index 6a751f2..a058faa 100644
--- a/core/src/main/java/org/apache/sdap/mudrod/driver/ESDriver.java
+++ b/core/src/main/java/org/apache/sdap/mudrod/driver/ESDriver.java
@@ -133,6 +133,7 @@ public void destroyBulkProcessor() {
refreshIndex();
} catch (InterruptedException e) {
LOG.error("Error destroying the Bulk Processor.", e);
+ Thread.currentThread().interrupt();
}
}
@@ -473,12 +474,11 @@ protected Client makeClient(Properties props) throws
IOException {
Client client = null;
- // Prefer TransportClient
- if (hosts != null && port > 1) {
+ if (hosts != null && port > 1) {
TransportClient transportClient = new ESTransportClient(settings);
for (String host : hosts)
transportClient.addTransportAddress(new
InetSocketTransportAddress(InetAddress.getByName(host), port));
- client = transportClient;
+ return transportClient;
} else if (clusterName != null) {
node = new Node(settings);
client = node.client();
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
