From cf6da8d2384364d6c7c14c7eddd5885231795c69 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Sun, 8 Nov 2015 18:35:30 +1100
Subject: [PATCH] remove redundant recoverable

---
 Snippets/Operations/SqlServer/ErrorQueue.cs   | 9 +++------
 nservicebus/gateway/multi-site-deployments.md | 1 -
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Snippets/Operations/SqlServer/ErrorQueue.cs b/Snippets/Operations/SqlServer/ErrorQueue.cs
index 405882484f7..4a05365be91 100644
--- a/Snippets/Operations/SqlServer/ErrorQueue.cs
+++ b/Snippets/Operations/SqlServer/ErrorQueue.cs
@@ -44,7 +44,6 @@ class MessageToRetry
         {
             public Guid Id;
             public string Headers;
-            public bool Recoverable;
             public byte[] Body;
         }
 
@@ -71,7 +70,7 @@ static void RetryMessage(string connectionString, string queueName, MessageToRet
                     parameters.Add("Id", SqlDbType.UniqueIdentifier).Value = messageToRetry.Id;
                     parameters.Add("Headers", SqlDbType.VarChar).Value = messageToRetry.Headers;
                     parameters.Add("Body", SqlDbType.VarBinary).Value = messageToRetry.Body;
-                    parameters.Add("Recoverable", SqlDbType.Bit).Value = messageToRetry.Recoverable;
+                    parameters.Add("Recoverable", SqlDbType.Bit).Value = true;
                     command.ExecuteNonQuery();
                 }
             }
@@ -82,7 +81,6 @@ static MessageToRetry ReadAndDelete(string connectionString, string queueName, G
             string sql = string.Format(
                 @"DELETE FROM [{0}] 
                 OUTPUT 
-                   DELETED.Recoverable,
                    DELETED.Headers,
                    DELETED.Body
                 WHERE Id = @Id", queueName);
@@ -102,9 +100,8 @@ static MessageToRetry ReadAndDelete(string connectionString, string queueName, G
                         return new MessageToRetry
                         {
                             Id = messageId,
-                            Recoverable = reader.GetBoolean(0),
-                            Headers = reader.GetString(1),
-                            Body = reader.GetSqlBinary(2).Value
+                            Headers = reader.GetString(0),
+                            Body = reader.GetSqlBinary(1).Value
                         };
                     }
                 }
diff --git a/nservicebus/gateway/multi-site-deployments.md b/nservicebus/gateway/multi-site-deployments.md
index 3b43e108c19..775851377c4 100644
--- a/nservicebus/gateway/multi-site-deployments.md
+++ b/nservicebus/gateway/multi-site-deployments.md
@@ -94,7 +94,6 @@ Then at configuration time:
 
 <!-- import GatewaySitesAppConfig -->
 
-
 NServiceBus automatically sets the required headers that enable you to send messages back over the gateway using the familiar `Bus.Reply`.
 
 NOTE: All cross-site interactions are performed internally to a service, so publish and subscribe are not supported across gateways.