Merge pull request apache#383 from aaronmell/SentinelFixes

Sentinel GET-MASTER-ADDR-BY-NAME throws exception when service name i…
Jens-G · May 16, 2016 · 0b47916 · 0b47916
2 parents 9cb8ac2 + 6b5381f
commit 0b47916
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/StackExchange.Redis/StackExchange/Redis/ResultProcessor.cs b/StackExchange.Redis/StackExchange/Redis/ResultProcessor.cs
@@ -1235,8 +1235,13 @@ protected override bool SetResultCore(PhysicalConnection connection, Message mes
                         {
                             SetResult(message, null);
                             return true;
-                        }
-                        break;
+                        }
+                        break;
+                    case ResultType.SimpleString:
+                        //We don't want to blow up if the master is not found
+                        if (result.IsNull)
+                            return true;
+                        break;
                 }
                 return false;
             }