From 7307e37efec6e5aa7675121a664c24060efe086f Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Mon, 2 Sep 2013 21:53:00 +0200
Subject: [PATCH] Previously added logging in TransportRefreshAction caused NPE
 if search shards had errors (or was not yet started/assigned) Better
 formatting for logging in TransportRefreshAction

---
 .../indices/refresh/TransportRefreshAction.java   |  2 +-
 .../search/type/TransportSearchTypeAction.java    | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java
index 4b71a5f3bd8..7ef1bfe3a1a 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java
@@ -113,7 +113,7 @@ public class TransportRefreshAction extends TransportBroadcastOperationAction<Re
     protected ShardRefreshResponse shardOperation(ShardRefreshRequest request) throws ElasticSearchException {
         IndexShard indexShard = indicesService.indexServiceSafe(request.index()).shardSafe(request.shardId());
         indexShard.refresh(new Engine.Refresh().force(request.force()));
-        logger.debug("Refresh request executed for {}. Force: [{}].", indexShard.shardId(), request.force());
+        logger.debug("{} Refresh request executed. Force: [{}].", indexShard.shardId(), request.force());
         return new ShardRefreshResponse(request.index(), request.shardId());
     }
 
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java
index 0843b90518a..16d41c8ad82 100644
--- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java
+++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java
@@ -390,13 +390,20 @@ public abstract class TransportSearchTypeAction extends TransportAction<SearchRe
         final void innerMoveToSecondPhase() throws Exception {
             if (logger.isDebugEnabled()) {
                 StringBuilder sb = new StringBuilder();
+                boolean hadOne = false;
                 for (int i = 0; i < firstResults.length(); i++) {
-                    SearchShardTarget shard = firstResults.get(i).shardTarget();
-                    if (i > 0) {
-                        sb.append(",");
+                    FirstResult result = firstResults.get(i);
+                    if (result == null) {
+                        continue; // failure
                     }
-                    sb.append(shard);
+                    if (hadOne) {
+                        sb.append(",");
+                    } else {
+                        hadOne = true;
+                    }
+                    sb.append(result.shardTarget());
                 }
+
                 logger.debug("Moving to second phase, based on results from: {}", sb);
             }
             moveToSecondPhase();