You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by mf...@apache.org on 2014/07/21 20:29:57 UTC
[04/11] git commit: STREAMS-131 | Fixed bug in elasticsearch client
manager close
STREAMS-131 | Fixed bug in elasticsearch client manager close
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/0d1fc31a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/0d1fc31a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/0d1fc31a
Branch: refs/heads/master
Commit: 0d1fc31a87d50fed37860667e34b5d0e1fff6b35
Parents: 78aa10f
Author: mfranklin <mf...@apache.org>
Authored: Thu Jul 10 11:12:18 2014 -0400
Committer: mfranklin <mf...@apache.org>
Committed: Thu Jul 10 11:12:18 2014 -0400
----------------------------------------------------------------------
.../streams/elasticsearch/ElasticsearchClientManager.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0d1fc31a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchClientManager.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchClientManager.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchClientManager.java
index 340d2b9..d107e70 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchClientManager.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchClientManager.java
@@ -80,7 +80,7 @@ public class ElasticsearchClientManager {
}
public boolean isOnOrAfterVersion(Version version) {
- return ALL_CLIENTS.get(this.elasticsearchConfiguration.toString()).getVersion().onOrAfter(version);
+ return ALL_CLIENTS.get(this.elasticsearchConfiguration.getClusterName()).getVersion().onOrAfter(version);
}
public void start() throws Exception {
@@ -110,12 +110,12 @@ public class ElasticsearchClientManager {
public synchronized void stop() {
// Terminate the elasticsearch cluster
// Check to see if we have a client.
- if (ALL_CLIENTS.containsKey(this.elasticsearchConfiguration.toString())) {
+ if (ALL_CLIENTS.containsKey(this.elasticsearchConfiguration.getClusterName())) {
// Close the client
- ALL_CLIENTS.get(this.elasticsearchConfiguration.toString()).getClient().close();
+ ALL_CLIENTS.get(this.elasticsearchConfiguration.getClusterName()).getClient().close();
// Remove it so that it isn't in memory any more.
- ALL_CLIENTS.remove(this.elasticsearchConfiguration.toString());
+ ALL_CLIENTS.remove(this.elasticsearchConfiguration.getClusterName());
}
}