From e2400bc40e953671a3a70a606ebe6585e548cdf1 Mon Sep 17 00:00:00 2001
From: David Pilato <david@pilato.fr>
Date: Fri, 13 Sep 2013 11:48:55 +0200
Subject: [PATCH] Fix possible NPE due to #3658 change

---
 src/main/java/org/elasticsearch/common/Strings.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/elasticsearch/common/Strings.java b/src/main/java/org/elasticsearch/common/Strings.java
index 8f15f6221df..7ee2a275c69 100644
--- a/src/main/java/org/elasticsearch/common/Strings.java
+++ b/src/main/java/org/elasticsearch/common/Strings.java
@@ -1042,7 +1042,7 @@ public class Strings {
     }
 
     public static String[] splitStringToArray(final CharSequence s, final char c) {
-        if (s.length() == 0) {
+        if (s == null || s.length() == 0) {
             return Strings.EMPTY_ARRAY;
         }
         int count = 1;