From 5706e5f6b9040daeca87decd01652e8a139f7d81 Mon Sep 17 00:00:00 2001
From: kimchy <kimchy@gmail.com>
Date: Fri, 23 Jul 2010 01:12:36 +0300
Subject: [PATCH] rename node close to node closed exception

---
 .../support/master/TransportMasterNodeOperationAction.java  | 6 +++---
 .../TransportShardReplicationOperationAction.java           | 6 +++---
 .../{NodeCloseException.java => NodeClosedException.java}   | 6 ++++--
 3 files changed, 10 insertions(+), 8 deletions(-)
 rename modules/elasticsearch/src/main/java/org/elasticsearch/node/{NodeCloseException.java => NodeClosedException.java} (87%)

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeOperationAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeOperationAction.java
index 318d4364961..52ff4b29075 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeOperationAction.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeOperationAction.java
@@ -31,7 +31,7 @@ import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.discovery.MasterNotDiscoveredException;
-import org.elasticsearch.node.NodeCloseException;
+import org.elasticsearch.node.NodeClosedException;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.*;
 
@@ -109,7 +109,7 @@ public abstract class TransportMasterNodeOperationAction<Request extends MasterN
 
                         @Override public void onClose() {
                             clusterService.remove(this);
-                            listener.onFailure(new NodeCloseException(nodes.localNode()));
+                            listener.onFailure(new NodeClosedException(nodes.localNode()));
                         }
 
                         @Override public void onTimeout(TimeValue timeout) {
@@ -155,7 +155,7 @@ public abstract class TransportMasterNodeOperationAction<Request extends MasterN
 
                                 @Override public void onClose() {
                                     clusterService.remove(this);
-                                    listener.onFailure(new NodeCloseException(nodes.localNode()));
+                                    listener.onFailure(new NodeClosedException(nodes.localNode()));
                                 }
 
                                 @Override public void onTimeout(TimeValue timeout) {
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java
index ccb9b358724..c1105e61856 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java
@@ -46,7 +46,7 @@ import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.shard.service.IndexShard;
 import org.elasticsearch.indices.IndexMissingException;
 import org.elasticsearch.indices.IndicesService;
-import org.elasticsearch.node.NodeCloseException;
+import org.elasticsearch.node.NodeClosedException;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.*;
 
@@ -295,7 +295,7 @@ public abstract class TransportShardReplicationOperationAction<Request extends S
 
                             @Override public void handleException(RemoteTransportException exp) {
                                 // if we got disconnected from the node, or the node / shard is not in the right state (being closed)
-                                if (exp.unwrapCause() instanceof ConnectTransportException || exp.unwrapCause() instanceof NodeCloseException ||
+                                if (exp.unwrapCause() instanceof ConnectTransportException || exp.unwrapCause() instanceof NodeClosedException ||
                                         exp.unwrapCause() instanceof IllegalIndexShardStateException) {
                                     primaryOperationStarted.set(false);
                                     // we already marked it as started when we executed it (removed the listener) so pass false
@@ -344,7 +344,7 @@ public abstract class TransportShardReplicationOperationAction<Request extends S
 
                     @Override public void onClose() {
                         clusterService.remove(this);
-                        listener.onFailure(new NodeCloseException(nodes.localNode()));
+                        listener.onFailure(new NodeClosedException(nodes.localNode()));
                     }
 
                     @Override public void clusterChanged(ClusterChangedEvent event) {
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/node/NodeCloseException.java b/modules/elasticsearch/src/main/java/org/elasticsearch/node/NodeClosedException.java
similarity index 87%
rename from modules/elasticsearch/src/main/java/org/elasticsearch/node/NodeCloseException.java
rename to modules/elasticsearch/src/main/java/org/elasticsearch/node/NodeClosedException.java
index 9c83fc3d21f..470335893f7 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/node/NodeCloseException.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/node/NodeClosedException.java
@@ -23,13 +23,15 @@ import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 
 /**
+ * An exception indicating that node is closed.
+ *
  * @author kimchy (shay.banon)
  */
-public class NodeCloseException extends ElasticSearchException {
+public class NodeClosedException extends ElasticSearchException {
 
     private final DiscoveryNode node;
 
-    public NodeCloseException(DiscoveryNode node) {
+    public NodeClosedException(DiscoveryNode node) {
         super("node closed " + node);
         this.node = node;
     }