fix NPE that can occur in genMessage of FailedShardsException

crate · Feb 12, 2015 · e14cbeb · e14cbeb
1 parent 560e09e
commit e14cbeb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/sql/src/main/java/io/crate/exceptions/FailedShardsException.java b/sql/src/main/java/io/crate/exceptions/FailedShardsException.java
@@ -33,10 +33,6 @@ public FailedShardsException(ShardOperationFailedException[] shardFailures) {
         super(genMessage(shardFailures));
     }
 
-    public FailedShardsException(ShardOperationFailedException[] shardFailures, Throwable original) {
-        super(genMessage(shardFailures), original);
-    }
-
     private static String genMessage(ShardOperationFailedException[] shardFailures) {
         StringBuilder sb;
 
@@ -47,18 +43,22 @@ private static String genMessage(ShardOperationFailedException[] shardFailures)
         }
 
         List<String> errors = new ArrayList<>(shardFailures.length);
+        String table = null;
         for (ShardOperationFailedException shardFailure : shardFailures) {
             if (shardFailure == null) {
                 continue;
             }
             errors.add(shardFailure.shardId()+" ( "+shardFailure.reason()+" )");
+            table = shardFailure.index();
         }
 
+        if (errors.isEmpty() && table == null) {
+            return "query failed on unknown shard / table";
+        }
         sb.append(Joiner.on(", ").join(errors));
-        if(shardFailures[0].index() != null){
-            sb.append(" of table ").append(shardFailures[0].index());
+        if (table != null) {
+            sb.append(" of table ").append(table);
         }
-
         return sb.toString();
     }
 

diff --git a/sql/src/test/java/io/crate/exceptions/FailedShardsExceptionTest.java b/sql/src/test/java/io/crate/exceptions/FailedShardsExceptionTest.java
@@ -34,6 +34,13 @@
 
 public class FailedShardsExceptionTest {
 
+    @Test
+    public void testThatGenMessageDoesNotRaiseNPEIfShardOperationFailedExceptionIsNull() throws Exception {
+        //noinspection ThrowableInstanceNeverThrown
+        FailedShardsException exception = new FailedShardsException(new ShardOperationFailedException[]{null});
+        assertThat(exception.getMessage(), is("query failed on unknown shard / table"));
+    }
+
     @Test
     public void testShardFailureReasonIsNull() throws Exception {
         FailedShardsException exception = new FailedShardsException(new ShardOperationFailedException[]{new ShardOperationFailedException() {