From 51277a94862bd102658374db332759f2e7d25a8a Mon Sep 17 00:00:00 2001
From: kimchy <kimchy@gmail.com>
Date: Thu, 30 Dec 2010 13:12:08 +0200
Subject: [PATCH] no need to check for shard if tis null, we know its not

---
 .../action/search/type/TransportSearchTypeAction.java       | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java
index b58ffd94b50..1e4280e23b9 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java
@@ -219,11 +219,7 @@ public abstract class TransportSearchTypeAction extends BaseAction<SearchRequest
                     moveToSecondPhase();
                 } catch (Exception e) {
                     if (logger.isDebugEnabled()) {
-                        if (shard != null) {
-                            logger.debug(shard.shortSummary() + ": Failed to execute [" + request + "] while moving to second phase", e);
-                        } else {
-                            logger.debug(shardIt.shardId() + ": Failed to execute [" + request + "] while moving to second phase", e);
-                        }
+                        logger.debug(shardIt.shardId() + ": Failed to execute [" + request + "] while moving to second phase", e);
                     }
                     invokeListener(new ReduceSearchPhaseException(firstPhaseName(), "", e, buildShardFailures()));
                 }